diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 9e382bc2c..5b5dce509 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -337,10 +337,12 @@ Map::EnsureGridCreated(const GridPair &p)
 void
 Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player)
 {
-    NGridType *grid = getNGrid(cell.GridX(), cell.GridY());
+    NGridType *grid;
 
     if(EnsureGridLoaded(cell))
     {
+        grid = getNGrid(cell.GridX(), cell.GridY());
+
         if (player)
         {
             player->SendDelayResponse(MAX_GRID_LOAD_TIME);
@@ -354,6 +356,8 @@ Map::EnsureGridLoadedAtEnter(const Cell &cell, Player *player)
         ResetGridExpiry(*getNGrid(cell.GridX(), cell.GridY()), 0.1f);
         grid->SetGridState(GRID_STATE_ACTIVE);
     }
+    else
+        grid = getNGrid(cell.GridX(), cell.GridY());
 
     if (player)
         AddToGrid(player,grid,cell);
diff --git a/src/game/Map.h b/src/game/Map.h
index b40589245..9252f9928 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -425,7 +425,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj
         CreatureMoveList i_creaturesToMove;
 
         bool loaded(const GridPair &) const;
-        void  EnsureGridCreated(const GridPair &);
+        void EnsureGridCreated(const GridPair &);
         bool EnsureGridLoaded(Cell const&);
         void EnsureGridLoadedAtEnter(Cell const&, Player* player = NULL);
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b636f09f7..5c729de55 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 "7593"
+ #define REVISION_NR "7594"
 #endif // __REVISION_NR_H__