diff --git a/common/net/minecraftforge/fluids/BlockFluidBase.java b/common/net/minecraftforge/fluids/BlockFluidBase.java
index 826ec6c07..5ec9f9234 100644
--- a/common/net/minecraftforge/fluids/BlockFluidBase.java
+++ b/common/net/minecraftforge/fluids/BlockFluidBase.java
@@ -1,4 +1,3 @@
-
 package net.minecraftforge.fluids;
 
 import java.util.HashMap;
@@ -130,7 +129,13 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
             return false;
         }
 
-        if (this.density > getDensity(world, x, y, z))
+        int density = getDensity(world, x, y, z);
+        if (density == Integer.MAX_VALUE) 
+        {
+        	 return true;
+        }
+        
+        if (this.density > density)
         {
         	return true;
         }
@@ -171,9 +176,15 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock
         {
             return false;
         }
-        Block.blocksList[bId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
 
-         if (this.density > getDensity(world, x, y, z))
+        int density = getDensity(world, x, y, z);
+        if (density == Integer.MAX_VALUE) 
+        {
+        	 Block.blocksList[bId].dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
+        	 return true;
+        }
+        
+        if (this.density > density)
         {
         	return true;
         }
diff --git a/common/net/minecraftforge/fluids/BlockFluidClassic.java b/common/net/minecraftforge/fluids/BlockFluidClassic.java
index b5349ca6f..5af4160ec 100644
--- a/common/net/minecraftforge/fluids/BlockFluidClassic.java
+++ b/common/net/minecraftforge/fluids/BlockFluidClassic.java
@@ -1,4 +1,3 @@
-
 package net.minecraftforge.fluids;
 
 import java.util.Random;
@@ -304,9 +303,15 @@ public class BlockFluidClassic extends BlockFluidBase
             return false;
         }
 
-        if (this.density > getDensity(world, x, y, z))
+        int density = getDensity(world, x, y, z);
+        if (density == Integer.MAX_VALUE) 
         {
-        	return true;
+             return true;
+        }
+        
+        if (this.density > density)
+        {
+            return true;
         }
         else
         {