diff --git a/src/client/MapleCharacter.java b/src/client/MapleCharacter.java
index 5b0c50e317..300321eb3e 100644
--- a/src/client/MapleCharacter.java
+++ b/src/client/MapleCharacter.java
@@ -8605,8 +8605,9 @@ public class MapleCharacter extends AbstractMapleCharacterObject {
                 }
             }
         };
-        
-        map.registerCharacterStatUpdate(r);
+        if (map != null) {
+            map.registerCharacterStatUpdate(r);
+	}
     }
     
     private Pair<MapleStat, Integer> calcHpRatioUpdate(int newHp, int oldHp) {