From 9b7abb8d968fc98951574113d63017b28b65ba18 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Fri, 17 Jan 2014 11:18:04 -0500
Subject: [PATCH] Added null check

---
 common/mekanism/generators/common/block/BlockGenerator.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/mekanism/generators/common/block/BlockGenerator.java b/common/mekanism/generators/common/block/BlockGenerator.java
index d622a19df..9fb9aeca7 100644
--- a/common/mekanism/generators/common/block/BlockGenerator.java
+++ b/common/mekanism/generators/common/block/BlockGenerator.java
@@ -487,7 +487,10 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds
 
 		if(!world.isRemote)
 		{
-			((TileEntityElectricBlock)tileEntity).register();
+			if(tileEntity != null)
+			{
+				((TileEntityElectricBlock)tileEntity).register();
+			}
 		}
 	}