diff --git a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java
index 9271b43dd..9155961e1 100644
--- a/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java
+++ b/src/main/java/mekanism/client/gui/element/GuiFluidGauge.java
@@ -1,9 +1,5 @@
 package mekanism.client.gui.element;
 
-import java.util.Arrays;
-
-import org.lwjgl.input.Keyboard;
-
 import mekanism.api.Coord4D;
 import mekanism.api.transmitters.TransmissionType;
 import mekanism.client.gui.GuiMekanism;
@@ -19,6 +15,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidTank;
+import org.lwjgl.input.Keyboard;
+
+import java.util.Arrays;
 
 public class GuiFluidGauge extends GuiGauge<Fluid>
 {
@@ -81,8 +80,13 @@ public class GuiFluidGauge extends GuiGauge<Fluid>
 		{
 			return height-2;
 		}
+
+        if(infoHandler.getTank().getFluid() == null || infoHandler.getTank().getCapacity() == 0)
+        {
+            return 0;
+        }
 		
-		return infoHandler.getTank().getFluid() != null ? infoHandler.getTank().getFluidAmount()*(height-2) / infoHandler.getTank().getCapacity() : 0;
+		return infoHandler.getTank().getFluidAmount()*(height-2) / infoHandler.getTank().getCapacity();
 	}
 
 	@Override
diff --git a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java
index 0c355559c..3d4112f43 100644
--- a/src/main/java/mekanism/client/gui/element/GuiGasGauge.java
+++ b/src/main/java/mekanism/client/gui/element/GuiGasGauge.java
@@ -1,9 +1,5 @@
 package mekanism.client.gui.element;
 
-import java.util.Arrays;
-
-import org.lwjgl.input.Keyboard;
-
 import mekanism.api.Coord4D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasTank;
@@ -19,6 +15,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
+import org.lwjgl.input.Keyboard;
+
+import java.util.Arrays;
 
 public class GuiGasGauge extends GuiGauge<Gas>
 {
@@ -81,8 +80,13 @@ public class GuiGasGauge extends GuiGauge<Gas>
 		{
 			return height-2;
 		}
+
+        if(infoHandler.getTank().getGas() == null || infoHandler.getTank().getMaxGas() == 0)
+        {
+            return 0;
+        }
 		
-		return infoHandler.getTank().getGas() != null ? infoHandler.getTank().getStored()*(height-2) / infoHandler.getTank().getMaxGas() : 0;
+		return infoHandler.getTank().getStored()*(height-2) / infoHandler.getTank().getMaxGas();
 	}
 
 	@Override