diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs
index 8138dfb5d6..d8014dc0f6 100644
--- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs
+++ b/Content.Server/GameObjects/Components/Mobs/MindComponent.cs
@@ -2,11 +2,11 @@
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces.GameTicking;
 using Content.Server.Mobs;
-using Content.Server.Players;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timers;
 using Robust.Shared.Utility;
@@ -91,7 +91,7 @@ namespace Content.Server.GameObjects.Components.Mobs
                         // Async this so that we don't throw if the grid we're on is being deleted.
                         var mapMan = IoCManager.Resolve<IMapManager>();
 
-                        if (!mapMan.GridExists(spawnPosition.GridID))
+                        if (spawnPosition.GridID == GridId.Invalid || !mapMan.GridExists(spawnPosition.GridID))
                         {
                             spawnPosition = IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint();
                         }
diff --git a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
index 643a92ff4d..e78695c0a0 100644
--- a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
+++ b/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
@@ -133,11 +133,11 @@ namespace Content.Server.GameObjects.Components.Movement
 
             if (!removed)
             {
-                mindComp.Mind.Visit(Owner);
+                mindComp.Mind?.Visit(Owner);
             }
             else
             {
-                mindComp.Mind.UnVisit();
+                mindComp.Mind?.UnVisit();
             }
         }
     }