diff --git a/MobArena.jar b/MobArena.jar
index e4ba0ee..5a4b535 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/resources/plugin.yml b/resources/plugin.yml
index 322b331..6141782 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: MobArena
 author: garbagemule
 main: com.garbagemule.MobArena.MobArena
-version: 0.94.4.80
+version: 0.94.4.81
 softdepend: [Spout,MultiVerse,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault]
 commands:
     ma:
diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java
index ddf480e..33155a6 100644
--- a/src/com/garbagemule/MobArena/ArenaListener.java
+++ b/src/com/garbagemule/MobArena/ArenaListener.java
@@ -607,19 +607,22 @@ public class ArenaListener
         }
 
         else if (monsters.getMonsters().contains(event.getEntity())) {
-            if (event.getReason() == TargetReason.FORGOT_TARGET)
+            if (event.getReason() == TargetReason.FORGOT_TARGET) {
                 event.setTarget(MAUtils.getClosestPlayer(plugin, event.getEntity(), arena));
-
-            else if (event.getReason() == TargetReason.TARGET_DIED)
+            }
+            else if (event.getReason() == TargetReason.TARGET_DIED) {
                 event.setTarget(MAUtils.getClosestPlayer(plugin, event.getEntity(), arena));
-
-            else if (event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY)
-                if (arena.hasPet(event.getTarget()))
+            }
+            else if (event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY) {
+                if (arena.hasPet(event.getTarget())) {
                     event.setCancelled(true);
-
-                else if (event.getReason() == TargetReason.CLOSEST_PLAYER)
-                    if (!arena.inArena((Player) event.getTarget()))
-                        event.setCancelled(true);
+                }
+            }
+            else if (event.getReason() == TargetReason.CLOSEST_PLAYER) {
+                if (!arena.inArena((Player) event.getTarget())) {
+                    event.setCancelled(true);
+                }
+            }
         }
     }
     
diff --git a/src/com/garbagemule/MobArena/ArenaMasterImpl.java b/src/com/garbagemule/MobArena/ArenaMasterImpl.java
index 142dbeb..e7ee6ab 100644
--- a/src/com/garbagemule/MobArena/ArenaMasterImpl.java
+++ b/src/com/garbagemule/MobArena/ArenaMasterImpl.java
@@ -390,7 +390,7 @@ public class ArenaMasterImpl implements ArenaMaster
 
         // If the helmet isn't a real helmet, set it explicitly.
         ItemStack helmet = inv.getHelmet();
-        if (helmet.getTypeId() != 0 && ArmorType.getType(helmet) != ArmorType.HELMET) {
+        if (helmet != null && ArmorType.getType(helmet) != ArmorType.HELMET) {
             section.set("helmet", ItemParser.parseString(helmet));
         }