diff --git a/src/main/java/storagecraft/tile/TileCable.java b/src/main/java/storagecraft/tile/TileCable.java
index c2f3222ba..7762f6174 100755
--- a/src/main/java/storagecraft/tile/TileCable.java
+++ b/src/main/java/storagecraft/tile/TileCable.java
@@ -4,6 +4,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
+import storagecraft.StorageCraftBlocks;
 import storagecraft.block.BlockCable;
 
 import java.util.List;
@@ -34,7 +35,12 @@ public class TileCable extends TileBase
 
 	public boolean isSensitiveCable()
 	{
-		return (Boolean) worldObj.getBlockState(pos).getValue(BlockCable.SENSITIVE);
+		if (worldObj.getBlockState(pos).getBlock() == StorageCraftBlocks.CABLE)
+		{
+			return (Boolean) worldObj.getBlockState(pos).getValue(BlockCable.SENSITIVE);
+		}
+
+		return false;
 	}
 
 	public boolean isEnabled()
diff --git a/src/main/java/storagecraft/tile/TileController.java b/src/main/java/storagecraft/tile/TileController.java
index 6ac51c78d..ab36560e8 100755
--- a/src/main/java/storagecraft/tile/TileController.java
+++ b/src/main/java/storagecraft/tile/TileController.java
@@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import storagecraft.StorageCraft;
 import storagecraft.StorageCraftBlocks;
 import storagecraft.block.BlockController;
 import storagecraft.block.EnumControllerType;
@@ -115,7 +116,8 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 				}
 			}
 
-			switch (getType()){
+			switch (getType())
+			{
 				case NORMAL:
 					energy.extractEnergy(energyUsage, false);
 					break;
@@ -124,14 +126,21 @@ public class TileController extends TileBase implements IEnergyReceiver, INetwor
 					break;
 			}
 
-			if (lastEnergy != energy.getEnergyStored()) {
+			if (lastEnergy != energy.getEnergyStored())
+			{
 				worldObj.updateComparatorOutputLevel(pos, StorageCraftBlocks.CONTROLLER);
 			}
 		}
 	}
 
-	public EnumControllerType getType() {
-		return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE);
+	public EnumControllerType getType()
+	{
+		if (worldObj.getBlockState(pos).getBlock() == StorageCraftBlocks.CONTROLLER)
+		{
+			return (EnumControllerType) worldObj.getBlockState(pos).getValue(BlockController.TYPE);
+		}
+
+		return EnumControllerType.NORMAL;
 	}
 
 	public void onDestroyed()