diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
index ffda3ac6a..d24fc8969 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
@@ -266,7 +266,8 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH
 
 		fuelTank.read(nbtTags.getCompoundTag("fuelTank"));
 		
-		FuelGas fuel = FuelHandler.getFuel(fuelTank.getGas().getGas());
+		boolean isTankEmpty = (fuelTank.getGas() == null);
+		FuelGas fuel = (isTankEmpty) ? null : FuelHandler.getFuel(fuelTank.getGas().getGas());
 		
 		if(fuel != null) 
 		{