diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index 1689a6947..43c38dde0 100644
--- a/src/game/ObjectAccessor.cpp
+++ b/src/game/ObjectAccessor.cpp
@@ -49,11 +49,14 @@ ObjectAccessor::~ObjectAccessor() {}
 Creature*
 ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const &u, uint64 guid)
 {
-    if(Creature *unit = GetPet(guid))
-        return unit;
+    if(IS_PLAYER_GUID(guid))
+        return NULL;
 
-    if(Creature *unit = GetVehicle(guid))
-        return unit;
+    if(IS_PET_GUID(guid))
+        return GetPet(guid);
+
+    if(IS_VEHICLE_GUID(guid))
+        return GetVehicle(guid);
 
     return u.GetMap()->GetCreature(guid);
 }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index a5b8ce876..db384add3 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 "8041"
+ #define REVISION_NR "8042"
 #endif // __REVISION_NR_H__