diff --git a/Spigot-Server-Patches/0236-Avoid-NPE-during-CraftBlockEntityState-load.patch b/Spigot-Server-Patches/0236-Avoid-NPE-during-CraftBlockEntityState-load.patch
new file mode 100644
index 0000000000..96965ee2da
--- /dev/null
+++ b/Spigot-Server-Patches/0236-Avoid-NPE-during-CraftBlockEntityState-load.patch
@@ -0,0 +1,29 @@
+From 1c427c765b20086e3ee11f87d4e5ffb653067c43 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Mon, 18 Sep 2017 13:38:40 -0700
+Subject: [PATCH] Avoid NPE during CraftBlockEntityState load
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+index 266f87d7..22dcaea7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+@@ -24,6 +24,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
+ 
+         // copy tile entity data:
+         this.snapshot = this.createSnapshot(tileEntity);
++        if(this.snapshot != null) // Paper - avoid NPE during load
+         this.load(snapshot);
+     }
+ 
+@@ -35,6 +36,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
+ 
+         // copy tile entity data:
+         this.snapshot = this.createSnapshot(tileEntity);
++        if(this.snapshot != null) // Paper - avoid NPE during load
+         this.load(snapshot);
+     }
+ 
+-- 
+2.14.1
+