diff --git a/src/main/java/us/myles/ViaVersion/slot/ItemSlotRewriter.java b/src/main/java/us/myles/ViaVersion/slot/ItemSlotRewriter.java
index ce75abb61..00b225b1d 100644
--- a/src/main/java/us/myles/ViaVersion/slot/ItemSlotRewriter.java
+++ b/src/main/java/us/myles/ViaVersion/slot/ItemSlotRewriter.java
@@ -178,6 +178,7 @@ public class ItemSlotRewriter {
         public CompoundTag tag;
 
         public static ItemStack fromBukkit(org.bukkit.inventory.ItemStack stack) {
+            if(stack == null) return null;
             ItemStack item = new ItemStack();
             item.id = (short) stack.getTypeId();
             item.amount = (byte) stack.getAmount();