diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 9b481a08fd..9b6632ff4e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -170,6 +170,7 @@ public class CraftChunk implements Chunk {
                 for (int j = 0; j < 4096; j++) {
                     if (baseids[j] == 0) continue;
                     IBlockData blockData = (IBlockData) net.minecraft.server.Block.d.a(baseids[j]);
+                    if (blockData == null) continue;
                     blockids[j] = (short) net.minecraft.server.Block.getId(blockData.getBlock());
                     int data = blockData.getBlock().toLegacyData(blockData);
                     int jj = j >> 1;