diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index 4beee488..820aa876 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -199,6 +199,17 @@ namespace NewHorizons.Handlers
                             return false;
                         }
                     }
+                    else if (body.Config.isStellarRemnant)
+                    {
+                        try
+                        {
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.LogError($"Couldn't make stellar remnant for [{body.Config.name}]:\n{ex}");
+                            return false;
+                        }
+                    }
                     else
                     {
                         UpdateBody(body, existingPlanet);
@@ -217,6 +228,11 @@ namespace NewHorizons.Handlers
                     // If the ground state object isn't made yet do it later
                     _nextPassBodies.Add(body);
                 }
+                else if (body.Config.isStellarRemnant)
+                {
+                    // If the star object isn't made yet do it later
+                    _nextPassBodies.Add(body);
+                }
                 else
                 {
                     try