1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/basetypes/MCHashMap.cpp b/src/core/basetypes/MCHashMap.cpp
index c56277fc..9958c502 100644
--- a/src/core/basetypes/MCHashMap.cpp
+++ b/src/core/basetypes/MCHashMap.cpp
@@ -169,6 +169,10 @@ void HashMap::removeObjectForKey(Object * key)
 {
     unsigned int func, indx;
     HashMapIter * iter, * old;
+
+    if (key == NULL) {
+        return;
+    }
     
     func = key->hash();;
     indx = func % mAllocated;