diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index addfa2a55..746c216d4 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -723,7 +723,18 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder *holder)
     }
 
     uint32 miscRequirement = 0;
-    AreaLockStatus lockStatus = pCurrChar->GetAreaTriggerLockStatus(sObjectMgr.GetMapEntranceTrigger(pCurrChar->GetMapId()), pCurrChar->GetDifficulty(pCurrChar->GetMap()->IsRaid()), miscRequirement);
+    AreaLockStatus lockStatus = AREA_LOCKSTATUS_OK;
+    if (AreaTrigger const* at = sObjectMgr.GetMapEntranceTrigger(pCurrChar->GetMapId()))
+        lockStatus = pCurrChar->GetAreaTriggerLockStatus(at, pCurrChar->GetDifficulty(pCurrChar->GetMap()->IsRaid()), miscRequirement);
+    else
+    {
+        // Some basic checks in case of a map without areatrigger
+        MapEntry const* mapEntry = sMapStore.LookupEntry(pCurrChar->GetMapId());
+        if (!mapEntry)
+            lockStatus = AREA_LOCKSTATUS_UNKNOWN_ERROR;
+        else if (pCurrChar->GetSession()->Expansion() < mapEntry->Expansion())
+            lockStatus = AREA_LOCKSTATUS_INSUFFICIENT_EXPANSION;
+    }
     if (lockStatus != AREA_LOCKSTATUS_OK || !pCurrChar->GetMap()->Add(pCurrChar))
     {
         // normal delayed teleport protection not applied (and this correct) for this case (Player object just created)
diff --git a/src/game/LootMgr.cpp b/src/game/LootMgr.cpp
index 5ce85fdfc..025268789 100644
--- a/src/game/LootMgr.cpp
+++ b/src/game/LootMgr.cpp
@@ -337,12 +337,12 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
     {
         if (needs_quest)
         {
-            sLog.outErrorDb("Table '%s' entry %d item %d: negative chance is specified for a reference, skipped", store.GetName(), entry, itemid);
+            sLog.outErrorDb("Table '%s' entry %d item %d: negative chance is given for a reference, skipped", store.GetName(), entry, itemid);
             return false;
         }
         else if (chance == 0)                               // no chance for the reference
         {
-            sLog.outErrorDb("Table '%s' entry %d item %d: zero chance is specified for a reference, skipped", store.GetName(), entry, itemid);
+            sLog.outErrorDb("Table '%s' entry %d item %d: zero chance is given for a reference, reference will never be used, skipped", store.GetName(), entry, itemid);
             return false;
         }
     }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 278771745..1b28a20d6 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 "12592"
+ #define REVISION_NR "12593"
 #endif // __REVISION_NR_H__