diff --git a/patches/net/minecraft/world/World.java.patch b/patches/net/minecraft/world/World.java.patch
index a00f029..91a98ba 100644
--- a/patches/net/minecraft/world/World.java.patch
+++ b/patches/net/minecraft/world/World.java.patch
@@ -472,7 +472,7 @@
  
          this.calculateInitialSkylight();
          this.calculateInitialWeather();
-+        this.getServer().addWorld(this.world); // CraftBukkit
++        if (getServer() != null) getServer().addWorld(world); // CraftBukkit
      }
 +    // Cauldron end