diff --git a/src/game/ObjectGuid.cpp b/src/game/ObjectGuid.cpp
index b8a41f0b1..eefc901d3 100644
--- a/src/game/ObjectGuid.cpp
+++ b/src/game/ObjectGuid.cpp
@@ -56,7 +56,7 @@ std::string ObjectGuid::GetString() const
 
     str << " (";
     if (HasEntry())
-        str << "Entry: " << GetEntry() << " ";
+        str << (IsPet() ? "Petnumber: " : "Entry: ") << GetEntry() << " ";
     str << "Guid: " << GetCounter() << ")";
     return str.str();
 }
diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h
index 34f7f7bee..4fc9bb07c 100644
--- a/src/game/ObjectGuid.h
+++ b/src/game/ObjectGuid.h
@@ -161,8 +161,9 @@ class MANGOS_DLL_SPEC ObjectGuid
         bool IsVehicle()       const { return GetHigh() == HIGHGUID_VEHICLE; }
         bool IsCreatureOrPet() const { return IsCreature() || IsPet(); }
         bool IsCreatureOrVehicle() const { return IsCreature() || IsVehicle(); }
+        bool IsAnyTypeCreature() const { return IsCreature() || IsPet() || IsVehicle(); }
         bool IsPlayer()        const { return !IsEmpty() && GetHigh() == HIGHGUID_PLAYER; }
-        bool IsUnit()          const { return IsCreatureOrPet() || IsPlayer(); }
+        bool IsUnit()          const { return IsAnyTypeCreature() || IsPlayer(); }
         bool IsItem()          const { return GetHigh() == HIGHGUID_ITEM; }
         bool IsGameobject()    const { return GetHigh() == HIGHGUID_GAMEOBJECT; }
         bool IsDynamicObject() const { return GetHigh() == HIGHGUID_DYNAMICOBJECT; }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f882e642a..41473a0c3 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 "10541"
+ #define REVISION_NR "10542"
 #endif // __REVISION_NR_H__