diff --git a/Zennysoft.Game.Ma/src/map/Map.cs b/Zennysoft.Game.Ma/src/map/Map.cs
index 620ef6c1..a93f4f42 100644
--- a/Zennysoft.Game.Ma/src/map/Map.cs
+++ b/Zennysoft.Game.Ma/src/map/Map.cs
@@ -105,6 +105,7 @@ public partial class Map : Node3D, IMap
   private void ClearCurrentMap()
   {
     CurrentFloor?.CallDeferred(MethodName.QueueFree, []);
+    Player.TeleportPlayer(new Transform3D(Basis.Identity, new Vector3(-999, -999, -999)));
   }
 
   private void SetupDungeonFloor()
diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/CorridorRoom.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/CorridorRoom.cs
index 39adc173..6123274c 100644
--- a/Zennysoft.Game.Ma/src/map/dungeon/code/CorridorRoom.cs
+++ b/Zennysoft.Game.Ma/src/map/dungeon/code/CorridorRoom.cs
@@ -19,7 +19,8 @@ public partial class CorridorRoom : Node3D
 
   public void Setup()
   {
-    _room.BodyEntered += Room_BodyEntered;
+    if (_room != null)
+      _room.BodyEntered += Room_BodyEntered;
   }
 
   private void Room_BodyEntered(Node3D body)