diff --git a/src/main/java/carpet/CarpetServer.java b/src/main/java/carpet/CarpetServer.java
index a0bfa319..5c5c3fd0 100644
--- a/src/main/java/carpet/CarpetServer.java
+++ b/src/main/java/carpet/CarpetServer.java
@@ -112,7 +112,7 @@ public class CarpetServer // static for now - easier to handle all around the co
     public static void onServerClosed(MinecraftServer server)
     {
         currentCommandDispatcher = null;
-        scriptServer.onClose();
+        if (scriptServer != null) scriptServer.onClose();
         settingsManager.detachServer();
         LoggerRegistry.stopLoggers();
         extensions.forEach(e -> e.onServerClosed(server));