diff --git a/MobArena.jar b/MobArena.jar
index 0698e14..e8e86b4 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 0f6fbb6..f2e525e 100644
--- a/src/com/garbagemule/MobArena/Arena.java
+++ b/src/com/garbagemule/MobArena/Arena.java
@@ -809,7 +809,7 @@ public class Arena
     {
         for (Wolf w : pets)
         {
-            if (w == null || !((Player) w.getOwner()).getName().equals(p.getName()))
+            if (w == null || !(w.getOwner() instanceof Player) || !((Player) w.getOwner()).getName().equals(p.getName()))
                 continue;
             
             w.setOwner(null);
diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java
index 490f238..a1be3b9 100644
--- a/src/com/garbagemule/MobArena/MAUtils.java
+++ b/src/com/garbagemule/MobArena/MAUtils.java
@@ -391,6 +391,11 @@ public class MAUtils
     {
         // Grab the items from the MobArena .inv file
         ItemStack[] stacks = getInventoryFile(p);
+        if (stacks == null)
+        {
+            MobArena.warning("Couldn't restore player inventory for '" + p.getName() + "'");
+            return false;
+        }
         
         // If the player isn't online, hack the playerName.dat file
         if (!p.isOnline())
@@ -439,7 +444,7 @@ public class MAUtils
         catch (Exception e)
         {
             e.printStackTrace();
-            MobArena.warning("Could not restore inventory for " + p.getName());
+            MobArena.warning("Could not get inventory file for '" + p.getName() + "'");
             return null;
         }
     }