diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
index 26409a4f5..1584bf8d9 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -82,7 +82,7 @@ public abstract class CraftBlockEntityState<T extends TileEntity> extends CraftB
     }
 
     protected boolean isApplicable(TileEntity tileEntity) {
-        return this.tileEntity.getClass() == tileEntity.getClass();
+        return tileEntity != null && this.tileEntity.getClass() == tileEntity.getClass();
     }
 
     @Override