From a88692a0f22caa30f97a1cb62f7fdda28ddde1c8 Mon Sep 17 00:00:00 2001
From: CovertJaguar <covertjaguar@gmail.com>
Date: Sat, 11 May 2013 04:27:52 -0600
Subject: [PATCH] Possible NPE if the liquid isn't in the LD

https://github.com/BuildCraft/BuildCraft/issues/787
---
 common/net/minecraftforge/liquids/LiquidStack.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);