diff --git a/MobArena.jar b/MobArena.jar
index debd674..8b6d4a9 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 fc0bcfa..fa4936e 100644
--- a/src/com/garbagemule/MobArena/Arena.java
+++ b/src/com/garbagemule/MobArena/Arena.java
@@ -408,7 +408,7 @@ public class Arena
             spawnThread.updateTargets();
 
         // Has to be delayed for TombStone not to fuck shit up.
-        Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin,
+            Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(plugin,
                 new Runnable()
                 {
                     public void run()
diff --git a/src/com/garbagemule/MobArena/MACommands.java b/src/com/garbagemule/MobArena/MACommands.java
index 1e70d8f..125c94a 100644
--- a/src/com/garbagemule/MobArena/MACommands.java
+++ b/src/com/garbagemule/MobArena/MACommands.java
@@ -171,7 +171,8 @@ public class MACommands implements CommandExecutor
             // If there was an error, don't join.
             if (error)
             {
-                arena.refund(p);
+                if (arena != null)
+                    arena.refund(p);
                 return true;
             }
             
diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java
index 020890b..e9e30e1 100644
--- a/src/com/garbagemule/MobArena/MAUtils.java
+++ b/src/com/garbagemule/MobArena/MAUtils.java
@@ -608,7 +608,7 @@ public class MAUtils
     
     /**
      * Removes all the pets belonging to this player.
-     */
+     *//*
     public static void clearPets(Arena arena, Player p)
     {
         for (Wolf w : arena.pets)
@@ -616,7 +616,7 @@ public class MAUtils
             if (w.getOwner().equals(p))
                 w.remove();
         }
-    }
+    }*/