diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index a3c62b099..62a3c650d 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -141,7 +141,7 @@ Creature::~Creature()
 void Creature::AddToWorld()
 {
     ///- Register the creature for guid lookup
-    if(!IsInWorld())
+    if(!IsInWorld() && GetGUIDHigh()==HIGHGUID_UNIT)
         GetMap()->GetObjectsStore().insert<Creature>(GetGUID(), (Creature*)this);
 
     Unit::AddToWorld();
@@ -150,7 +150,7 @@ void Creature::AddToWorld()
 void Creature::RemoveFromWorld()
 {
     ///- Remove the creature from the accessor
-    if(IsInWorld())
+    if(IsInWorld() && GetGUIDHigh()==HIGHGUID_UNIT)
         GetMap()->GetObjectsStore().erase<Creature>(GetGUID(), (Creature*)NULL);
 
     Unit::RemoveFromWorld();
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 1b1973540..9e5d95f22 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8745"
+ #define REVISION_NR "8746"
 #endif // __REVISION_NR_H__