diff --git a/StevenDimDoors/mod_pocketDim/core/PocketManager.java b/StevenDimDoors/mod_pocketDim/core/PocketManager.java
index 1272ecd..2b04529 100644
--- a/StevenDimDoors/mod_pocketDim/core/PocketManager.java
+++ b/StevenDimDoors/mod_pocketDim/core/PocketManager.java
@@ -173,12 +173,19 @@ public class PocketManager
 		{
 			return;
 		}
-
 		isLoading = true;
+		
 		dimensionData = new HashMap<Integer, InnerDimData>();
 		rootDimensions = new ArrayList<NewDimData>();
 		dimensionIDBlackList = new ArrayList<Integer>();
-
+		
+		if(FMLCommonHandler.instance().getEffectiveSide().isClient())
+		{
+			//Shouldnt try to load everything if we are a client
+			//This was preventing onPacket from loading properly
+			isLoading=false;
+			return;
+		}
 		//Register Limbo
 		DDProperties properties = DDProperties.instance();
 		registerDimension(properties.LimboDimensionID, null, false, false);
@@ -531,10 +538,6 @@ public class PocketManager
 		{
 			throw new IllegalStateException("Pocket dimensions are already loading!");
 		}
-
-		isLoading = true;
-		dimensionData = new HashMap<Integer, InnerDimData>();
-
 		// Load compacted client-side dimension data
 		Compactor.readDimensions(input, new DimRegistrationCallback());
 		
diff --git a/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java b/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
index a969a92..3c2a666 100644
--- a/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
+++ b/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
@@ -5,14 +5,17 @@ import java.io.DataInputStream;
 
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet250CustomPayload;
+import net.minecraft.server.integrated.IntegratedServer;
 import StevenDimDoors.mod_pocketDim.PacketConstants;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
 import StevenDimDoors.mod_pocketDim.watcher.ClientDimData;
 import StevenDimDoors.mod_pocketDim.watcher.IUpdateSource;
 import StevenDimDoors.mod_pocketDim.watcher.IUpdateWatcher;
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.IPacketHandler;
 import cpw.mods.fml.common.network.Player;
+import cpw.mods.fml.relauncher.Side;
 
 public class ClientPacketHandler implements IPacketHandler, IUpdateSource
 {
@@ -36,11 +39,10 @@ public class ClientPacketHandler implements IPacketHandler, IUpdateSource
 	{
 		// TODO: Is this even necessary? I'm not convinced we can receive packets from other channels anyway!
 		if (!packet.channel.equals(PacketConstants.CHANNEL_NAME))
-			return;
-		
-		// If this is a memory connection, then our client is running an integrated server.
-		// We can tell by checking if packet size is 0.
-		if (manager.packetSize() == 0)
+			return;		
+	
+		//Checking memory connection wasnt working for some reason, but this seems to work fine. 
+		if (FMLCommonHandler.instance().getMinecraftServerInstance() instanceof IntegratedServer)
 			return;
 		
 		try