diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index fbc1267bdb6..d694dcc18eb 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -3127,11 +3127,11 @@ bool Map::CheckRespawn(RespawnInfo* info)
         }
         case SPAWN_TYPE_GAMEOBJECT:
             // gameobject check is simpler - they cannot be dead or escorting
-            if (_gameobjectBySpawnIdStore.find(info->spawnId) != _gameobjectBySpawnIdStore.end())
+            if (_gameObjectBySpawnIdStore.find(info->spawnId) != _gameObjectBySpawnIdStore.end())
                 alreadyExists = true;
             break;
         default:
-            ABORT_MSG("Invalid spawn type %u with spawnId %u on map %u", uint32(info->type), info->spawnId, GetId());
+            ASSERT(false, "Invalid spawn type %u with spawnId %u on map %u", uint32(info->type), info->spawnId, GetId());
             return true;
     }
     if (alreadyExists)
diff --git a/src/server/game/Pools/PoolMgr.cpp b/src/server/game/Pools/PoolMgr.cpp
index 60f4a4414cb..1d27921ec75 100644
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -859,6 +859,6 @@ void PoolMgr::UpdatePool(uint32 pool_id, SpawnObjectType type, uint32 spawnId)
             UpdatePool<GameObject>(pool_id, spawnId);
             break;
         default:
-            ABORT_MSG("Invalid spawn type %u passed to PoolMgr::IsPartOfPool (with spawnId %u)", uint32(type), spawnId);
+            ASSERT(false, "Invalid spawn type %u passed to PoolMgr::IsPartOfPool (with spawnId %u)", uint32(type), spawnId);
     }
 }