diff --git a/NewHorizons/Builder/General/AstroObjectBuilder.cs b/NewHorizons/Builder/General/AstroObjectBuilder.cs
index aec97f75..8278d056 100644
--- a/NewHorizons/Builder/General/AstroObjectBuilder.cs
+++ b/NewHorizons/Builder/General/AstroObjectBuilder.cs
@@ -1,3 +1,4 @@
+using NewHorizons.Components;
 using NewHorizons.Components.Orbital;
 using NewHorizons.External.Configs;
 using NewHorizons.Utility.OWML;
@@ -61,7 +62,9 @@ namespace NewHorizons.Builder.General
                 Delay.RunWhen(
                     () => Locator._centerOfTheUniverse != null,
                     () => Locator._centerOfTheUniverse._staticReferenceFrame = astroObject.GetComponent<OWRigidbody>()
-                    );
+                );
+
+                PreserveActiveCenterOfTheUniverse.Apply(astroObject.gameObject);
             }
 
             return astroObject;
diff --git a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs
index 71fae84a..c6405bd9 100644
--- a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs
+++ b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs
@@ -80,7 +80,7 @@ namespace NewHorizons.Builder.Orbital
             }
             else
             {
-                NHLogger.LogError($"No primary gravity or focal point for {primaryBody}");
+                NHLogger.LogError($"Trying to put {secondaryBody.name} around {primaryBody.name} but found no primary gravity or focal point.");
             }
         }
 
diff --git a/NewHorizons/Components/PreserveActiveCenterOfTheUniverse.cs b/NewHorizons/Components/PreserveActiveCenterOfTheUniverse.cs
new file mode 100644
index 00000000..0e8cd3c0
--- /dev/null
+++ b/NewHorizons/Components/PreserveActiveCenterOfTheUniverse.cs
@@ -0,0 +1,26 @@
+using NewHorizons.Utility.OWML;
+using UnityEngine;
+
+namespace NewHorizons.Components
+{
+    // Prevents the center of the universe being deactivated
+    public class PreserveActiveCenterOfTheUniverse : MonoBehaviour
+    {
+        private GameObject _centerOfTheUniverse;
+
+        public static void Apply(GameObject center)
+        {
+            var go = new GameObject(nameof(PreserveActiveCenterOfTheUniverse));
+            go.AddComponent<PreserveActiveCenterOfTheUniverse>()._centerOfTheUniverse = center;
+        }
+
+        public void Update()
+        {
+            if (!_centerOfTheUniverse.activeInHierarchy)
+            {
+                NHLogger.LogWarning("Center of the universe cannot be inactive.");
+                _centerOfTheUniverse.SetActive(true);
+            }
+        }
+    }
+}
diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index 73d814a5..0379a982 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -245,20 +245,10 @@ namespace NewHorizons.Handlers
                     try
                     {
                         NHLogger.Log($"Creating [{body.Config.name}]");
-                        var planetObject = GenerateBody(body, defaultPrimaryToSun);
-                        try
-                        {
-                            planetObject?.SetActive(true);
-                        }
-                        catch (Exception e)
-                        {
-                            NHLogger.LogError($"Error when activating new planet [{body.Config.name}] - {e}");
-                        }
-                        if (planetObject == null) 
-                        { 
-                            body.UnloadCache(); 
-                            return false; 
-                        }
+                        var planetObject = GenerateBody(body, defaultPrimaryToSun) 
+                            ?? throw new NullReferenceException("Something went wrong when generating the body but no errors were logged.");
+                        
+                        planetObject.SetActive(true);
 
                         var ao = planetObject.GetComponent<NHAstroObject>();
 
diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json
index 2e669fbc..2ab0644b 100644
--- a/NewHorizons/manifest.json
+++ b/NewHorizons/manifest.json
@@ -4,7 +4,7 @@
   "author": "xen, Bwc9876, clay, MegaPiggy, John, Trifid, Hawkbar, Book",
   "name": "New Horizons",
   "uniqueName": "xen.NewHorizons",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "owmlVersion": "2.9.3",
   "dependencies": [ "JohnCorby.VanillaFix", "_nebula.MenuFramework", "xen.CommonCameraUtility", "dgarro.CustomShipLogModes" ],
   "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "PacificEngine.OW_CommonResources" ],