diff --git a/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRef.java b/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRef.java
index 957eac8..27bd1be 100644
--- a/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRef.java
+++ b/src/main/java/cpw/mods/fml/common/registry/ObjectHolderRef.java
@@ -61,7 +61,7 @@
 
 		if (this.injectedObject == null || !isValid())
 		{
-			throw new IllegalStateException("The ObjectHolder annotation cannot apply to a field that is not an Item or Block");
+			throw new IllegalStateException(String.format("The ObjectHolder annotation cannot apply to a field that is not an Item or Block (found : %s at %s.%s)", field.getType().getName(), field.getClass().getName(), field.getName()));
 		}
 		makeWritable(field);
 	}
diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java
index 7c43ac9..92bf5a6 100644
--- a/src/main/java/net/minecraftforge/common/MinecraftForge.java
+++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java
@@ -12,6 +12,7 @@
 import net.minecraft.crash.CrashReport;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeHooks.SeedEntry;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class MinecraftForge
@@ -156,6 +157,8 @@
 	   }
 
 	   UsernameCache.load();
+	   // Load before all the mods, so MC owns the MC fluids
+	   FluidRegistry.validateFluidRegistry();
    }
 
 
diff --git a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
index a127b8c..d6b988b 100644
--- a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
+++ b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java
@@ -112,7 +112,7 @@
 			Integer id = localFluidIDs.remove(oldFluid);
 			localFluidIDs.put(fluid, id);
 		}
-		BiMap<Integer, String> localFluidNames = fluidNames;
+		BiMap<Integer, String> localFluidNames = HashBiMap.create();
 		for (Entry<Fluid, Integer> e : localFluidIDs.entrySet()) {
 			localFluidNames.put(e.getValue(), e.getKey().getName());
 		}