diff --git a/StatusMonitor/StatusMonitor.cs b/StatusMonitor/StatusMonitor.cs
index 776964533a..240bf00c56 100644
--- a/StatusMonitor/StatusMonitor.cs
+++ b/StatusMonitor/StatusMonitor.cs
@@ -74,15 +74,13 @@ public void HandleStatus(Status status)
                     EDDI.Instance.Cmdr.credits = Convert.ToUInt64( currentStatus.credit_balance );
                 }
 
-                if ( currentStatus is null || lastStatus is null ) { return; }
-
                 // Update vehicle information
-                if ( !string.IsNullOrEmpty( currentStatus.vehicle ) && currentStatus.vehicle != lastStatus.vehicle )
+                if ( !string.IsNullOrEmpty( currentStatus.vehicle ) && currentStatus.vehicle != lastStatus?.vehicle )
                 {
                     if ( EDDI.Instance.Vehicle != currentStatus.vehicle )
                     {
                         var statusSummary = new Dictionary<string, Status> { { "isStatus", currentStatus }, { "wasStatus", lastStatus } };
-                        Logging.Debug( $"Status changed vehicle from {lastStatus.vehicle} to {currentStatus.vehicle}", statusSummary );
+                        Logging.Debug( $"Status changed vehicle from {lastStatus?.vehicle ?? "<NULL>"} to {currentStatus.vehicle}", statusSummary );
                         EDDI.Instance.Vehicle = currentStatus.vehicle;
                     }
                 }
@@ -93,6 +91,8 @@ public void HandleStatus(Status status)
                     EDDI.Instance.CurrentShip.fuelInReservoir = currentStatus.fuelInReservoir ?? 0;
                 }
 
+                if ( lastStatus is null ) { return; }
+
                 // Trigger events for changed status, as applicable
                 if ( currentStatus.shields_up != lastStatus.shields_up && currentStatus.vehicle == lastStatus.vehicle )
                 {