diff --git a/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TankNetwork.java b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TankNetwork.java
index 677043ac4..f22f5bddb 100644
--- a/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TankNetwork.java
+++ b/archaic/src/main/java/resonantinduction/archaic/fluid/tank/TankNetwork.java
@@ -3,6 +3,7 @@ package resonantinduction.archaic.fluid.tank;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.PriorityQueue;
+import java.util.Random;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.fluids.FluidStack;
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
index 1b6d82ea1..835ee7da4 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
@@ -31,7 +31,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class PartPipe extends PartFramedNode<EnumPipeMaterial, FluidPressureNode, IPressureNodeProvider> implements IPressureNodeProvider, TSlottedPart, JNormalOcclusion, IHollowConnect
 {
-	protected FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
+	protected final FluidTank tank = new FluidTank(FluidContainerRegistry.BUCKET_VOLUME);
 	/**
 	 * Computes the average fluid for client to render.
 	 */
@@ -183,7 +183,7 @@ public class PartPipe extends PartFramedNode<EnumPipeMaterial, FluidPressureNode
 	{
 		if (packetID == 3)
 		{
-			tank = new FluidTank(packet.readInt());
+			tank.setCapacity(packet.readInt());
 			tank.readFromNBT(packet.readNBTTagCompound());
 		}
 		else
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
index 66886e843..b4cbbe8ca 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
@@ -149,7 +149,7 @@ public class TilePump extends TileMechanical implements IPressureNodeProvider, I
 	@Override
 	public FluidTank getPressureTank()
 	{
-		return null;
+		return new FluidTank(0);
 	}
 
 	@Override
diff --git a/src/main/java/resonantinduction/core/fluid/TileFluidNode.java b/src/main/java/resonantinduction/core/fluid/TileFluidNode.java
index 29b66d5e0..9b08b8289 100644
--- a/src/main/java/resonantinduction/core/fluid/TileFluidNode.java
+++ b/src/main/java/resonantinduction/core/fluid/TileFluidNode.java
@@ -115,7 +115,7 @@ public abstract class TileFluidNode extends TileBase implements IPacketReceiverW
 	@Override
 	public Packet getDescriptionPacket()
 	{
-		if (getInternalTank().getFluid() == null || getInternalTank().getFluid().getFluid().getName() != null)
+		if (getInternalTank().getFluid() == null || (getInternalTank().getFluid() != null && getInternalTank().getFluid().getFluid().getName() != null))
 			return ResonantInduction.PACKET_TILE.getPacketWithID(PACKET_DESCRIPTION, this, this.colorID, this.renderSides, getInternalTank().getCapacity(), getInternalTank().writeToNBT(new NBTTagCompound()));
 		return null;
 	}