diff --git a/NewHorizons/Builder/Updater/OrbitUpdater.cs b/NewHorizons/Builder/Updater/OrbitUpdater.cs
index ac4f014d..9324652f 100644
--- a/NewHorizons/Builder/Updater/OrbitUpdater.cs
+++ b/NewHorizons/Builder/Updater/OrbitUpdater.cs
@@ -18,7 +18,7 @@ namespace NewHorizons.Builder.Updater
         public static void Update(NewHorizonsBody body, GameObject go)
         {
             var mapping = Planet.defaultMapping;
-            var heavenlyBody = CommonResourcesUtilities.HeavenlyBodyFromAstroObject(AstroObjectLocator.GetAstroObject(body.Config.Name));
+            var heavenlyBody = CommonResourcesUtilities.HeavenlyBodyFromAstroObject(go.GetComponent<AstroObject>());
 
             Logger.Log($"Updating position of {body.Config.Name}/{heavenlyBody}");
 
diff --git a/NewHorizons/Utility/CommonResources/CommonResourcesUtilities.cs b/NewHorizons/Utility/CommonResources/CommonResourcesUtilities.cs
index 1622e0bc..40ae6116 100644
--- a/NewHorizons/Utility/CommonResources/CommonResourcesUtilities.cs
+++ b/NewHorizons/Utility/CommonResources/CommonResourcesUtilities.cs
@@ -13,6 +13,11 @@ namespace NewHorizons.Utility.CommonResources
     {
         public static HeavenlyBody HeavenlyBodyFromAstroObject(AstroObject obj)
         {
+            if(obj == null)
+            {
+                Logger.LogError("Asking for a heavenly body from astro object but it is null");
+            }
+
             switch (obj.GetAstroObjectName())
             {
                 case AstroObject.Name.CustomString: