diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 60c39a369..1d9e859b6 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16194,8 +16194,11 @@ bool Player::HasGuardianWithEntry(uint32 entry)
     // pet guid middle part is entry (and creature also)
     // and in guardian list must be guardians with same entry _always_
     for(GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
-        if(GUID_ENPART(*itr)==entry)
-            return true;
+    {
+        if(Pet* pet = ObjectAccessor::GetPet(*itr))
+            if (Pet->GetEntry() == entry)
+                return true;
+    }
 
     return false;
 }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 42cdb8bbd..df99f43a3 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 "7779"
+ #define REVISION_NR "7780"
 #endif // __REVISION_NR_H__