diff --git a/common/net/minecraftforge/liquids/LiquidStack.java b/common/net/minecraftforge/liquids/LiquidStack.java
index a7fcdd1ce6..a52a9b36f5 100644
--- a/common/net/minecraftforge/liquids/LiquidStack.java
+++ b/common/net/minecraftforge/liquids/LiquidStack.java
@@ -54,7 +54,11 @@ public class LiquidStack
         nbt.setInteger("Amount", amount);
         nbt.setShort("Id", (short)itemID);
         nbt.setShort("Meta", (short)itemMeta);
-        nbt.setString("LiquidName", LiquidDictionary.findLiquidName(this));
+        String name = LiquidDictionary.findLiquidName(this);
+        if(name != null)
+        {
+            nbt.setString("LiquidName", name);
+        }
         if (extra != null)
         {
             nbt.setTag("extra", extra);