diff --git a/src/main/java/codechicken/nei/recipe/StackInfo.java b/src/main/java/codechicken/nei/recipe/StackInfo.java
index 1adeba71..e59b7df9 100644
--- a/src/main/java/codechicken/nei/recipe/StackInfo.java
+++ b/src/main/java/codechicken/nei/recipe/StackInfo.java
@@ -131,7 +131,14 @@ public class StackInfo {
         }
 
         if (isFluidDisplayItem(stackA)) {
-            return isFluidDisplayItem(stackB) && getFluid(stackA).isFluidEqual(getFluid(stackB));
+
+            if (isFluidDisplayItem(stackB)) {
+                final FluidStack fluidA = getFluid(stackA);
+                final FluidStack fluidB = getFluid(stackB);
+                return fluidA != null && fluidA.isFluidEqual(fluidB);
+            }
+
+            return false;
         }
 
         if (stackA.getItem() != stackB.getItem()) {
diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java
index e4b24a39..0b39f0a5 100644
--- a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java
+++ b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java
@@ -21,6 +21,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
     protected static Method getFluidFromDisplayStack = null;
     protected static Class<?> gtMetaGeneratedTool = null;
     protected static Field playSound = null;
+    private static boolean loggedNoNbtDisplay = false;
 
     static {
         try {
@@ -88,6 +89,12 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
                     return (FluidStack) obj;
                 }
 
+                final Fluid fluid = FluidRegistry.getFluid(stack.getItemDamage());
+
+                if (fluid != null) {
+                    return new FluidStack(fluid, 0);
+                }
+
             } else if (item == GameRegistry.findItem("ae2fc", "fluid_packet")) {
                 NBTTagCompound nbtTag = stack.getTagCompound();