diff --git a/common/net/minecraftforge/liquids/LiquidStack.java b/common/net/minecraftforge/liquids/LiquidStack.java
index f9848eaf0..e13cc3597 100644
--- a/common/net/minecraftforge/liquids/LiquidStack.java
+++ b/common/net/minecraftforge/liquids/LiquidStack.java
@@ -132,6 +132,11 @@ public class LiquidStack
             itemID = liquid.itemID;
             itemMeta = liquid.itemMeta;
         }
+        // if the item is not existent, and no liquid dictionary is found, null returns
+        else if (Item.itemsList[itemID] == null)
+        {
+            return null;
+        }
         int amount = nbt.getInteger("Amount");
         LiquidStack liquidstack = new LiquidStack(itemID, amount, itemMeta);
         return liquidstack.itemID == 0 ? null : liquidstack;