diff --git a/common/buildcraft/energy/worldgen/OilPopulate.java b/common/buildcraft/energy/worldgen/OilPopulate.java
index a46d695e..89246db8 100644
--- a/common/buildcraft/energy/worldgen/OilPopulate.java
+++ b/common/buildcraft/energy/worldgen/OilPopulate.java
@@ -185,15 +185,15 @@ public final class OilPopulate {
 				world.setBlock(wellX, baseY, wellZ, BuildCraftCore.springBlock, 1, 3);
 			}
 			for (int y = baseY + 1; y <= maxHeight; ++y) {
-				world.setBlock(wellX, y, wellZ, BuildCraftEnergy.blockOil);
+				world.setBlock(wellX, y, wellZ, BuildCraftEnergy.blockOil, 0, 3);
 			}
 
 			if (type == GenType.LARGE) {
 				for (int y = wellY; y <= maxHeight - wellHeight / 2; ++y) {
-					world.setBlock(wellX + 1, y, wellZ, BuildCraftEnergy.blockOil);
-					world.setBlock(wellX - 1, y, wellZ, BuildCraftEnergy.blockOil);
-					world.setBlock(wellX, y, wellZ + 1, BuildCraftEnergy.blockOil);
-					world.setBlock(wellX, y, wellZ - 1, BuildCraftEnergy.blockOil);
+					world.setBlock(wellX + 1, y, wellZ, BuildCraftEnergy.blockOil, 0, 3);
+					world.setBlock(wellX - 1, y, wellZ, BuildCraftEnergy.blockOil, 0, 3);
+					world.setBlock(wellX, y, wellZ + 1, BuildCraftEnergy.blockOil, 0, 3);
+					world.setBlock(wellX, y, wellZ - 1, BuildCraftEnergy.blockOil, 0, 3);
 				}
 			}
 
diff --git a/common/buildcraft/transport/PipeColoringRecipe.java b/common/buildcraft/transport/PipeColoringRecipe.java
index 964f2c71..937d0252 100644
--- a/common/buildcraft/transport/PipeColoringRecipe.java
+++ b/common/buildcraft/transport/PipeColoringRecipe.java
@@ -51,7 +51,7 @@ public class PipeColoringRecipe implements IRecipe {
 		
 		if (isBleach && dye != null) {
 			return null;
-		} else if ((isBleach || (dye != null && pipeStack.stackSize == 8)) && !hasDifferentPipes) {
+		} else if (pipeStack != null && (isBleach || (dye != null && pipeStack.stackSize == 8)) && !hasDifferentPipes) {
 			ItemStack result = pipeStack;
 			if (dye != null) {
 				result.setItemDamage(ColorUtils.getColorIDFromDye(dye) + 1);