diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
index b9e68d4801c..bfcadc53022 100644
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -321,6 +321,13 @@ public List<EntityCoordinates> GetArrivalsSpawnPoints()
     public EntityUid? SpawnPlayersOnArrivals(EntityUid? station, JobComponent? job, HumanoidCharacterProfile? profile)
     {
         var possiblePositions = GetArrivalsSpawnPoints();
+		
+		if (possiblePositions == null || possiblePositions.Count == 0)
+		{
+			Logger.Error("No valid arrival points found!");
+			return null;
+		}
+
 
         var spawnLoc = _random.Pick(possiblePositions);