From 7bfaa738e3d76afd972fb0a2eade0d85a858a372 Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Thu, 19 Mar 2015 08:53:43 -0400
Subject: [PATCH] Fixed teleporter crash

---
 .../mekanism/common/tile/TileEntityTeleporter.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java
index 10ebc82f2..42f7c5f94 100644
--- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java
+++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java
@@ -632,11 +632,17 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe
 		
 		FrequencyManager manager = getManager(new Frequency(null, null).setPublic(false));
 		
-		data.add(manager.getFrequencies().size());
-		
-		for(Frequency freq : manager.getFrequencies())
+		if(manager != null)
 		{
-			freq.write(data);
+			data.add(manager.getFrequencies().size());
+			
+			for(Frequency freq : manager.getFrequencies())
+			{
+				freq.write(data);
+			}
+		}
+		else {
+			data.add(0);
 		}
 
 		return data;