diff --git a/src/com/projectkorra/ProjectKorra/firebending/FireBurst.java b/src/com/projectkorra/ProjectKorra/firebending/FireBurst.java
index a4845a59..c95d17c8 100644
--- a/src/com/projectkorra/ProjectKorra/firebending/FireBurst.java
+++ b/src/com/projectkorra/ProjectKorra/firebending/FireBurst.java
@@ -44,7 +44,9 @@ public class FireBurst {
 		}
 		if (AvatarState.isAvatarState(player))
 			chargetime = 0;
-		if (BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) chargetime = 0;
+		if (BendingManager.events.containsKey(player.getWorld())) {
+			if(BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) chargetime = 0;
+		}
 		this.player = player;
 		instances.put(player, this);
 	}
diff --git a/src/com/projectkorra/ProjectKorra/firebending/Lightning.java b/src/com/projectkorra/ProjectKorra/firebending/Lightning.java
index 468011ad..8b7c784c 100644
--- a/src/com/projectkorra/ProjectKorra/firebending/Lightning.java
+++ b/src/com/projectkorra/ProjectKorra/firebending/Lightning.java
@@ -90,9 +90,11 @@ public class Lightning {
 			stunChance = AvatarState.getValue(stunChance);
 			//stunDuration = AvatarState.getValue(stunDuration);
 		}
-		else if(BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) {
-			chargeTime = 0;
-			cooldown = 0;
+		else if(BendingManager.events.containsKey(player.getWorld())) {
+			if (BendingManager.events.get(player.getWorld()).equalsIgnoreCase("SozinsComet")) {
+				chargeTime = 0;
+				cooldown = 0;
+			}
 		}
 		instances.add(this);
 	}