From 230d757a8918b2f4e9c1b0aa9c001ea3b5c85f4e Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Sat, 11 Apr 2015 17:27:14 -0400
Subject: [PATCH] Fix NPE - Closes #1794

---
 src/main/java/net/minecraftforge/fluids/FluidRegistry.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
index cb25e471b6..b6fc322587 100644
--- a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
+++ b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
@@ -165,7 +165,7 @@ public abstract class FluidRegistry
      */
     public static boolean isFluidRegistered(Fluid fluid)
     {
-        return fluids.containsKey(fluid.getName());
+        return fluid != null && fluids.containsKey(fluid.getName());
     }
 
     public static boolean isFluidRegistered(String fluidName)