diff --git a/NewHorizons/Builder/Body/FunnelBuilder.cs b/NewHorizons/Builder/Body/FunnelBuilder.cs
index c3969e90..cde0e76a 100644
--- a/NewHorizons/Builder/Body/FunnelBuilder.cs
+++ b/NewHorizons/Builder/Body/FunnelBuilder.cs
@@ -34,7 +34,7 @@ namespace NewHorizons.Builder.Body
             if (_lavaMaterial == null) _lavaMaterial = new Material(SearchUtilities.Find("VolcanicMoon_Body/MoltenCore_VM/LavaSphere").GetComponent<MeshRenderer>().sharedMaterial).DontDestroyOnLoad();
         }
 
-        public static void Make(GameObject planetGO, ConstantForceDetector detector, OWRigidbody rigidbody, FunnelModule module)
+        public static void Make(GameObject planetGO, Sector sector, ConstantForceDetector detector, OWRigidbody rigidbody, FunnelModule module)
         {
             InitPrefabs();
 
@@ -165,7 +165,9 @@ namespace NewHorizons.Builder.Body
                     break;
             }
 
-            var sector = planetGO.GetComponent<AstroObject>().GetPrimaryBody().GetRootSector();
+            var primaryBody = planetGO.GetComponent<AstroObject>().GetPrimaryBody();
+            if (primaryBody != null) sector = primaryBody.GetRootSector();
+
             proxyGO.GetComponent<SectorProxy>().SetSector(sector);
             geoGO.GetComponent<SectorCullGroup>().SetSector(sector);
             volumesGO.GetComponent<SectorCollisionGroup>().SetSector(sector);
diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index c8191b91..ca07f1a1 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -638,7 +638,7 @@ namespace NewHorizons.Handlers
 
             if (body.Config.Funnel != null)
             {
-                FunnelBuilder.Make(go, go.GetComponentInChildren<ConstantForceDetector>(), rb, body.Config.Funnel);
+                FunnelBuilder.Make(go, sector, go.GetComponentInChildren<ConstantForceDetector>(), rb, body.Config.Funnel);
             }
 
             // Has to go last probably