diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 15edf83c3..b5a3e3056 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -4085,9 +4085,7 @@ void Player::BuildCreateUpdateBlockForPlayer(UpdateData* data, Player* target) c
 
 void Player::SetPhaseAndMap(Player* target) const
 {
-    QueryResult *result = CharacterDatabase.PQuery("SELECT map, phase FROM character_phase_data WHERE guid = '%u'", target->GetGUIDLow());
-
-    if (result)
+    if (QueryResult *result = CharacterDatabase.PQuery("SELECT map, phase FROM character_phase_data WHERE guid = '%u'", target->GetGUIDLow()))
     {
         Field *fields = result->Fetch();
 
@@ -19980,7 +19978,8 @@ void Player::SetPhaseMask(uint32 newPhaseMask, bool update)
         bg->EventPlayerDroppedFlag(this);
 
     Unit::SetPhaseMask(newPhaseMask, update);
-    GetSession()->SendSetPhaseShift(GetPhaseMask());
+    if (IsInWorld())
+        GetSession()->SendSetPhaseShift(GetPhaseMask());
 }
 
 void Player::InitPrimaryProfessions()
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index bbca542af..fdd4d4f92 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 "12212"
+ #define REVISION_NR "12213"
 #endif // __REVISION_NR_H__