*Merge.

--HG--
branch : trunk

1 files changed, 7 insertions, 1 deletions

diff --git a/src/game/MapInstanced.cpp b/src/game/MapInstanced.cpp
index 5a26a28159f..116d26f4975 100644
--- a/src/game/MapInstanced.cpp
+++ b/src/game/MapInstanced.cpp
@@ -148,7 +148,13 @@ Map* MapInstanced::GetInstance(const WorldObject* obj)
                 // instantiate or find existing bg map for player
                 // the instance id is set in battlegroundid
                 NewInstanceId = player->GetBattleGroundId();
-                assert(NewInstanceId);
+                if(!NewInstanceId)
+                {
+                    if(player->GetSession()->PlayerLoading())
+                        return NULL;
+                    else
+                        assert(NewInstanceId);
+                }
                 map = _FindMap(NewInstanceId);
                 if(!map)
                     map = CreateBattleGround(NewInstanceId);