diff --git a/build.gradle b/build.gradle
index bdb436b..e4994cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "1.7.10-1.3.6"
+version = "1.7.10-1.3.7"
 group= "com.jaquadro.minecraft.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "StorageDrawers"
 
diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java
index 0d70922..eaefa25 100644
--- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java
+++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawersComp.java
@@ -490,12 +490,15 @@ public class TileEntityDrawersComp extends TileEntityDrawers
         @Override
         public void readFromNBT (int slot, NBTTagCompound tag) {
             if (tag.hasKey("Item")) {
-                ItemStack stack = new ItemStack(Item.getItemById(tag.getShort("Item")));
-                stack.setItemDamage(tag.getShort("Meta"));
-                if (tag.hasKey("Tags"))
-                    stack.setTagCompound(tag.getCompoundTag("Tags"));
+                Item item = Item.getItemById(tag.getShort("Item"));
+                if (item != null) {
+                    ItemStack stack = new ItemStack(item);
+                    stack.setItemDamage(tag.getShort("Meta"));
+                    if (tag.hasKey("Tags"))
+                        stack.setTagCompound(tag.getCompoundTag("Tags"));
 
-                protoStack[slot] = stack;
+                    protoStack[slot] = stack;
+                }
             }
         }
 
diff --git a/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java b/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java
index 02ceba7..6f82e45 100644
--- a/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java
+++ b/src/com/jaquadro/minecraft/storagedrawers/storage/DrawerData.java
@@ -161,12 +161,18 @@ public class DrawerData extends BaseDrawerData
 
     public void readFromNBT (NBTTagCompound tag) {
         if (tag.hasKey("Item") && tag.hasKey("Count")) {
-            ItemStack stack = new ItemStack(Item.getItemById(tag.getShort("Item")));
-            stack.setItemDamage(tag.getShort("Meta"));
-            if (tag.hasKey("Tags"))
-                stack.setTagCompound(tag.getCompoundTag("Tags"));
+            Item item = Item.getItemById(tag.getShort("Item"));
+            if (item != null) {
+                ItemStack stack = new ItemStack(item);
+                stack.setItemDamage(tag.getShort("Meta"));
+                if (tag.hasKey("Tags"))
+                    stack.setTagCompound(tag.getCompoundTag("Tags"));
 
-            setStoredItem(stack, tag.getInteger("Count"), false);
+                setStoredItem(stack, tag.getInteger("Count"), false);
+            }
+            else {
+                reset();
+            }
         }
         else {
             reset();