diff --git a/src/main/java/codechicken/lib/world/WorldExtension.java b/src/main/java/codechicken/lib/world/WorldExtension.java
index 7c3cd46..e6ff496 100644
--- a/src/main/java/codechicken/lib/world/WorldExtension.java
+++ b/src/main/java/codechicken/lib/world/WorldExtension.java
@@ -43,7 +43,8 @@ public abstract class WorldExtension {
     }
 
     protected final void saveChunkData(Chunk chunk, NBTTagCompound tag) {
-        chunkMap.get(chunk).saveData(tag);
+        final ChunkExtension extension = chunkMap.get(chunk);
+        if (extension != null) extension.saveData(tag);
     }
 
     protected final void remChunk(Chunk chunk) {