diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java
index 329aafb84..7635d9ef7 100644
--- a/src/main/java/mekanism/common/FluidNetwork.java
+++ b/src/main/java/mekanism/common/FluidNetwork.java
@@ -254,11 +254,14 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 			if(fluidStored != null)
 			{
 				prevTransferAmount = tickEmit(fluidStored, true);
-				fluidStored.amount -= prevTransferAmount;
-
-				if(fluidStored != null && fluidStored.amount <= 0)
+				if(fluidStored != null)
 				{
-					fluidStored = null;
+					fluidStored.amount -= prevTransferAmount;
+
+					if(fluidStored.amount <= 0)
+					{
+						fluidStored = null;
+					}
 				}
 			}
 		}