1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/MapManager.cpp b/src/game/MapManager.cpp
index 1645419fd4d..74405462749 100644
--- a/src/game/MapManager.cpp
+++ b/src/game/MapManager.cpp
@@ -117,10 +117,14 @@ MapManager::_createBaseMap(uint32 id)
         {
             m = new MapInstanced(id, i_gridCleanUpDelay);
         }
-        else
+        else if (entry)
         {
             m = new Map(id, i_gridCleanUpDelay, 0, 0);
         }
+        else
+        {
+            assert(false);
+        }
         i_maps[id] = m;
     }