diff --git a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs b/NewHorizons/Builder/ShipLog/MapModeBuilder.cs
index 22039b4c..c51ece61 100644
--- a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs
+++ b/NewHorizons/Builder/ShipLog/MapModeBuilder.cs
@@ -37,6 +37,7 @@ namespace NewHorizons.Builder.ShipLog
                     if (shipLogAstroObject._id == "POWER_STATION")
                     {
                         astroObject = GameObject.FindObjectsOfType<AstroObject>().FirstOrDefault(x => x._customName == "Power Station");
+                        if (astroObject == null) continue;
                     }
                     else
                     {
diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs
index b80cf1e3..b9d0ecbb 100644
--- a/NewHorizons/Main.cs
+++ b/NewHorizons/Main.cs
@@ -935,6 +935,10 @@ namespace NewHorizons
             {
                 _defaultStarSystem = defaultSystem;
             }
+            if (LoadManager.GetCurrentScene() != OWScene.SolarSystem && LoadManager.GetCurrentScene() != OWScene.EyeOfTheUniverse)
+            {
+                CurrentStarSystem = _defaultStarSystem;
+            }
         }
 
         #endregion Load