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)