From 2644fed4f8f15a878260d79f5348067009ef2110 Mon Sep 17 00:00:00 2001
From: Aidan Brady <aidancbrady@aol.com>
Date: Wed, 8 Jan 2014 19:51:05 -0500
Subject: [PATCH] A few corner cases in GUI checks, closes #795

---
 common/mekanism/client/ClientProxy.java | 5 +++++
 common/mekanism/common/CommonProxy.java | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java
index 564fabc90..8cefc5b9b 100644
--- a/common/mekanism/client/ClientProxy.java
+++ b/common/mekanism/client/ClientProxy.java
@@ -304,6 +304,11 @@ public class ClientProxy extends CommonProxy
 	{
 		TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
 		
+		if(tileEntity == null)
+		{
+			return null;
+		}
+		
 		switch(ID)
 		{
 			case 0:
diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java
index 57129b4b0..4522b51d1 100644
--- a/common/mekanism/common/CommonProxy.java
+++ b/common/mekanism/common/CommonProxy.java
@@ -267,6 +267,11 @@ public class CommonProxy
 	{
 		TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
 		
+		if(tileEntity == null)
+		{
+			return null;
+		}
+		
 		switch(ID)
 		{
 			case 0: