diff --git a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
index 56662ee9..48c8b4fe 100644
--- a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
+++ b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java
@@ -1091,7 +1091,9 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI {
         }
         
         /* Disable core */
-        core.disableCore();
+	    if (core != null) {
+		    core.disableCore();
+	    }
 
         if(SnapshotCache.sscache != null) {
         	SnapshotCache.sscache.cleanup();