diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 809cf6dfb..f3c0cb289 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -11322,6 +11322,7 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update)
 {
     WorldObject::SetPhaseMask(newPhaseMask,update);
 
-    if(Pet* pet = GetPet())
-        pet->SetPhaseMask(newPhaseMask,true);
+    if(IsInWorld())
+        if(Pet* pet = GetPet())
+            pet->SetPhaseMask(newPhaseMask,true);
 }
\ No newline at end of file
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index bf94b1f09..83106d8bd 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 "7207"
+ #define REVISION_NR "7208"
 #endif // __REVISION_NR_H__