diff --git a/Source/Game/BattleFields/BattleField.cs b/Source/Game/BattleFields/BattleField.cs
index 54a3009c2..8f18f905a 100644
--- a/Source/Game/BattleFields/BattleField.cs
+++ b/Source/Game/BattleFields/BattleField.cs
@@ -469,7 +469,7 @@ namespace Game.BattleFields
                 Global.CreatureTextMgr.SendChat(stalker, (byte)id, target);
         }
 
-        void SendInitWorldStatesTo(Player player)
+        public void SendInitWorldStatesTo(Player player)
         {
             InitWorldStates packet = new();
             packet.MapID = m_MapId;
diff --git a/Source/Game/BattleFields/BattleFieldManager.cs b/Source/Game/BattleFields/BattleFieldManager.cs
index 4439dc69c..f92ead578 100644
--- a/Source/Game/BattleFields/BattleFieldManager.cs
+++ b/Source/Game/BattleFields/BattleFieldManager.cs
@@ -46,6 +46,9 @@ namespace Game.BattleFields
                     uint scriptId = Global.ObjectMgr.GetScriptId(result.Read<string>(1));
 
                     var bf = Global.ScriptMgr.CreateBattlefield(scriptId);
+                    if (bf == null)
+                        continue;
+
                     if (!bf.SetupBattlefield())
                     {
                         Log.outInfo(LogFilter.Battlefield, $"Setting up battlefield with TypeId {typeId} failed.");