diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java
index f9ececc8..88fff813 100644
--- a/common/buildcraft/BuildCraftSilicon.java
+++ b/common/buildcraft/BuildCraftSilicon.java
@@ -249,6 +249,15 @@ public class BuildCraftSilicon extends BuildCraftMod {
 				'C', new ItemStack(redstoneChipset, 1, 0),
 				'G', "gearDiamond");
 
+		CoreProxy.proxy.addCraftingRecipe(new ItemStack(assemblyTableBlock, 1, 3),
+				"ORO",
+				"OCO",
+				"OGO",
+				'O', Blocks.obsidian,
+				'R', "dustRedstone",
+				'C', new ItemStack(redstoneChipset, 1, 0),
+				'G', "gearGold");
+
 		// COMMANDER BLOCKS
 		CoreProxy.proxy.addCraftingRecipe(new ItemStack(zonePlanBlock, 1, 0),
 				"IRI",
diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java
index 7d3612ff..244be6ee 100644
--- a/common/buildcraft/core/statements/TriggerFluidContainer.java
+++ b/common/buildcraft/core/statements/TriggerFluidContainer.java
@@ -70,14 +70,14 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern
 			switch (state) {
 				case Empty:
 					for (FluidTankInfo c : liquids) {
-						if (c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
+						if (c != null && c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
 							return false;
 						}
 					}
 					return true;
 				case Contains:
 					for (FluidTankInfo c : liquids) {
-						if (c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
+						if (c != null && c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
 							return true;
 						}
 					}
@@ -85,7 +85,7 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern
 				case Space:
 					if (searchedFluid == null) {
 						for (FluidTankInfo c : liquids) {
-							if (c.fluid == null || c.fluid.amount < c.capacity) {
+							if (c != null && (c.fluid == null || c.fluid.amount < c.capacity)) {
 								return true;
 							}
 						}
@@ -95,7 +95,7 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern
 				case Full:
 					if (searchedFluid == null) {
 						for (FluidTankInfo c : liquids) {
-							if (c.fluid == null || c.fluid.amount < c.capacity) {
+							if (c != null && (c.fluid == null || c.fluid.amount < c.capacity)) {
 								return false;
 							}
 						}
diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java
index 14b54393..700c947d 100644
--- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java
+++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java
@@ -74,6 +74,9 @@ public class TriggerFluidContainerLevel extends BCStatement implements ITriggerE
 			}
 
 			for (FluidTankInfo c : liquids) {
+				if (c == null) {
+					continue;
+				}
 				if (c.fluid == null) {
 					if (searchedFluid == null) {
 						return true;
diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java
index 541dee88..ff0ff12f 100644
--- a/common/buildcraft/transport/pipes/PipePowerWood.java
+++ b/common/buildcraft/transport/pipes/PipePowerWood.java
@@ -127,22 +127,6 @@ public class PipePowerWood extends Pipe<PipeTransportPower> implements IPipeTran
 		requestedEnergy = 0;
 	}
 
-	public boolean requestsPower() {
-		if (full) {
-			boolean request = battery.getEnergyStored() < battery.getMaxEnergyStored() / 2;
-
-			if (request) {
-				full = false;
-			}
-
-			return request;
-		}
-
-		full = battery.getEnergyStored() >= battery.getMaxEnergyStored() - 100;
-
-		return !full;
-	}
-
 	@Override
 	public void writeToNBT(NBTTagCompound data) {
 		super.writeToNBT(data);