From 8570748ad9855ccb522a72f8e4279bd90b336b09 Mon Sep 17 00:00:00 2001
From: Brian Lewis <brian.lewis@ticketmaster.com>
Date: Mon, 23 Feb 2015 10:12:45 -0600
Subject: [PATCH] Fix for a gas-generator with empty tank throwing exception
 during onChunkLoad (bug #2148)

---
 .../generators/common/tile/TileEntityGasGenerator.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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) 
 		{