diff --git a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
index bb428b45c9..26dc0011c2 100644
--- a/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
@@ -57,7 +57,8 @@ namespace Content.Server.Ghost.Roles.Components
 
             mind!.TransferTo(mob);
 
-            if (++_currentTakeovers < _availableTakeovers) return true;
+            if (++_currentTakeovers < _availableTakeovers)
+                return true;
 
             Taken = true;
 
diff --git a/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs
index e6e411aa33..4601fd0ebb 100644
--- a/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs
@@ -25,7 +25,7 @@ namespace Content.Server.Ghost.Roles.Components
             var mind = Owner.EnsureComponent<MindComponent>();
 
             if (mind.HasMind)
-                throw new Exception("MindComponent already has a mind!");
+                return false;
 
             var sessionMind = session.ContentData()?.Mind;