From 7aa1818823c61cc913122901b705954776423252 Mon Sep 17 00:00:00 2001
From: ElectroJr <leonsfriedrich@gmail.com>
Date: Fri, 19 Apr 2024 19:00:55 -0400
Subject: [PATCH] Update EmergencyShuttleSystem.cs

---
 Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index a63b182fa6..2a68f7a1be 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -259,10 +259,13 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
     /// </summary>
     public void CallEmergencyShuttle(EntityUid stationUid, StationEmergencyShuttleComponent? stationShuttle = null)
     {
-        if (!Resolve(stationUid, ref stationShuttle) ||
-            !TryComp<TransformComponent>(stationShuttle.EmergencyShuttle, out var xform) ||
+        if (!Resolve(stationUid, ref stationShuttle))
+            return;
+
+        if (!TryComp<TransformComponent>(stationShuttle.EmergencyShuttle, out var xform) ||
             !TryComp<ShuttleComponent>(stationShuttle.EmergencyShuttle, out var shuttle))
         {
+            Log.Error($"Attempted to call an emergency shuttle for an uninitialized station? Station: {ToPrettyString(stationUid)}. Shuttle: {ToPrettyString(stationShuttle.EmergencyShuttle)}");
             return;
         }
 
-- 
2.52.0