1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java
index 7db66225ac..a1b14cd062 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/enderStorage/EnderFluidContainer.java
@@ -17,12 +17,18 @@ public class EnderFluidContainer implements IFluidHandler, Serializable {
     }
 
     private FluidStack getFluidStack() {
-        return FluidStack.loadFluidStackFromNBT(fluid);
+        FluidStack fluidStack = null;
+        if (fluid != null) {
+            fluidStack =  FluidStack.loadFluidStackFromNBT(fluid);
+        }
+        return fluidStack;
     }
 
     private void setFluidStack(FluidStack fluidStack) {
         if (fluidStack != null) {
             fluid = fluidStack.writeToNBT(new NBTTagCompound());
+        } else {
+            fluid = null;
         }
     }