Index: src/game/GameObject.cpp
===================================================================
--- src/game/GameObject.cpp	(revision 5489)
+++ src/game/GameObject.cpp	(working copy)
@@ -528,9 +528,9 @@
 
 void GameObject::DeleteFromDB()
 {
-    objmgr.SaveGORespawnTime(m_DBTableGuid,GetInstanceId(),0);
-    objmgr.DeleteGOData(m_DBTableGuid);
     WorldDatabase.PExecute("DELETE FROM gameobject WHERE guid = '%u'", m_DBTableGuid);
+	objmgr.SaveGORespawnTime(m_DBTableGuid,GetInstanceId(),0);
+	objmgr.DeleteGOData(m_DBTableGuid);
 }
 
 GameObject* GameObject::GetGameObject(WorldObject& object, uint64 guid)
Index: src/game/Level2.cpp
===================================================================
--- src/game/Level2.cpp	(revision 5489)
+++ src/game/Level2.cpp	(working copy)
@@ -749,13 +749,15 @@
 
         uint32 lowguid = atoi(cId);
 
-        if(lowguid)
-            pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT));
+		if(!lowguid) 
+			return false;
+ 
+		pCreature = ObjectAccessor::GetCreature(*m_session->GetPlayer(),MAKE_GUID(lowguid,HIGHGUID_UNIT));
 
         // Attempting creature load from DB
         if(!pCreature)
-        {
-            QueryResult *result = WorldDatabase.PQuery( "SELECT guid,map FROM creature WHERE guid = '%u'",lowguid);
+		{
+            QueryResult *result = WorldDatabase.PQuery( "SELECT guid, map FROM creature WHERE guid = '%u'",lowguid);
             if(!result)
             {
                 PSendSysMessage(LANG_COMMAND_CREATGUIDNOTFOUND, lowguid);
@@ -774,10 +776,6 @@
                 return true;
             }
         }
-        else
-        {
-            lowguid = pCreature->GetDBTableGUIDLow();
-        }
     }
     else
     {