diff --git a/codechicken/lib/render/RenderUtils.java b/codechicken/lib/render/RenderUtils.java
index a867002..3fed169 100644
--- a/codechicken/lib/render/RenderUtils.java
+++ b/codechicken/lib/render/RenderUtils.java
@@ -236,7 +236,7 @@ public class RenderUtils
         Fluid fluid = stack.getFluid();
         CCRenderState.setColour(fluid.getColor(stack)<<8|alpha);        
         TextureUtils.bindAtlas(fluid.getSpriteNumber());
-        return fluid.getIcon(stack);
+        return TextureUtils.safeIcon(fluid.getIcon(stack));
     }
     
     /**
diff --git a/codechicken/lib/render/TextureUtils.java b/codechicken/lib/render/TextureUtils.java
index 4a01a1f..ce52719 100644
--- a/codechicken/lib/render/TextureUtils.java
+++ b/codechicken/lib/render/TextureUtils.java
@@ -176,4 +176,12 @@ public class TextureUtils
         }
         return false;
     }
+
+    public static Icon safeIcon(Icon icon)
+    {
+        if(icon == null)
+            icon = ((TextureMap)Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
+        
+        return icon;
+    }
 }