diff --git a/MobArena.jar b/MobArena.jar
index d12806b..d3c5572 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/src/com/garbagemule/MobArena/Arena.java b/src/com/garbagemule/MobArena/Arena.java
index a879114..c0ff9d0 100644
--- a/src/com/garbagemule/MobArena/Arena.java
+++ b/src/com/garbagemule/MobArena/Arena.java
@@ -713,6 +713,8 @@ public class Arena
     
     public void removeClassPermissions(Player p)
     {
+        if (attachments.get(p) == null) return;
+        
         for (PermissionAttachment pa : attachments.get(p))
             pa.remove();
     }