diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java
index da545017..acdca424 100644
--- a/common/buildcraft/BuildCraftCore.java
+++ b/common/buildcraft/BuildCraftCore.java
@@ -91,7 +91,7 @@ public class BuildCraftCore {
 
 	public static RenderMode render = RenderMode.Full;
 
-	public static boolean debugMode = true;
+	public static boolean debugMode = false;
 	public static boolean modifyWorld = false;
 	public static boolean trackNetworkUsage = false;
 
diff --git a/common/buildcraft/energy/OilPopulate.java b/common/buildcraft/energy/OilPopulate.java
index 28540a6a..86dccb49 100644
--- a/common/buildcraft/energy/OilPopulate.java
+++ b/common/buildcraft/energy/OilPopulate.java
@@ -64,10 +64,12 @@ public class OilPopulate {
 				int k = startZ + z;
 
 				int blockId = world.getBlockId(i, j, k);
-				if (blockId != 0 && blockId == Block.sand.blockID) {
-					generateSurfaceDeposit(world, rand, i, j, k, 3);
+				if (blockId != 0) {
+					if (blockId == Block.sand.blockID) {
+						generateSurfaceDeposit(world, rand, i, j, k, 3);
+					}
+					break;
 				}
-				break;
 			}
 		}