merge

--HG--
branch : trunk

1 files changed, 2 insertions, 0 deletions

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 7c2c2e6a658..b1da7a6ae94 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -1470,6 +1470,7 @@ bool ObjectMgr::MoveCreData(uint32 guid, uint32 mapId, Position pos)
             Creature *creature = new Creature;
             if(!creature->LoadFromDB(guid, map))
             {
+                creature->CleanupsBeforeDelete();
                 sLog.outError("AddCreature: cannot add creature entry %u to map", guid);
                 delete creature;
                 return false;
@@ -1521,6 +1522,7 @@ uint32 ObjectMgr::AddCreData(uint32 entry, uint32 team, uint32 mapId, float x, f
             Creature* creature = new Creature;
             if(!creature->LoadFromDB(guid, map))
             {
+                creature->CleanupsBeforeDelete();
                 sLog.outError("AddCreature: cannot add creature entry %u to map", entry);
                 delete creature;
                 return 0;