diff --git a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
index cfe7c13ef3..46c37731ac 100644
--- a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
+++ b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
@@ -144,6 +144,8 @@ public class FMLClientHandler implements IFMLSidedHandler
     private Map<ServerStatusResponse,JsonObject> extraServerListData;
     private Map<ServerData, ExtendedServerListData> serverDataTag;
 
+    private NetHandlerPlayClient currentPlayClient;
+
     /**
      * Called to start the whole game off
      *
@@ -532,7 +534,7 @@ public class FMLClientHandler implements IFMLSidedHandler
     @Override
     public INetHandler getClientPlayHandler()
     {
-        return this.client.func_147114_u();
+        return this.currentPlayClient;
     }
     @Override
     public NetworkManager getClientToServerNetworkManager()
@@ -697,6 +699,7 @@ public class FMLClientHandler implements IFMLSidedHandler
     public void setPlayClient(NetHandlerPlayClient netHandlerPlayClient)
     {
         playClientBlock.countDown();
+        this.currentPlayClient = netHandlerPlayClient;
     }
 
     @Override
diff --git a/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java b/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java
index 25a1189551..c7f3ee0c7b 100644
--- a/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java
+++ b/src/main/java/cpw/mods/fml/common/network/NetworkEventFiringHandler.java
@@ -1,5 +1,7 @@
 package cpw.mods.fml.common.network;
 
+import org.apache.logging.log4j.Level;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -26,4 +28,10 @@ public class NetworkEventFiringHandler extends SimpleChannelInboundHandler<FMLPr
         eventChannel.fireRead(msg,ctx);
     }
 
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "NetworkEventFiringHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/handshake/ChannelRegistrationHandler.java b/src/main/java/cpw/mods/fml/common/network/handshake/ChannelRegistrationHandler.java
index 76710246ec..a7c58995be 100644
--- a/src/main/java/cpw/mods/fml/common/network/handshake/ChannelRegistrationHandler.java
+++ b/src/main/java/cpw/mods/fml/common/network/handshake/ChannelRegistrationHandler.java
@@ -4,10 +4,11 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import java.util.Set;
 import net.minecraft.network.NetworkManager;
+import org.apache.logging.log4j.Level;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableSet;
 import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import cpw.mods.fml.relauncher.Side;
 
@@ -15,7 +16,7 @@ public class ChannelRegistrationHandler extends SimpleChannelInboundHandler<FMLP
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, FMLProxyPacket msg) throws Exception
     {
-        Side side = ctx.channel().attr(NetworkRegistry.CHANNEL_SOURCE).get();
+        Side side = msg.getTarget();
         NetworkManager manager = msg.getOrigin();
         if (msg.channel().equals("REGISTER") || msg.channel().equals("UNREGISTER"))
         {
@@ -32,4 +33,10 @@ public class ChannelRegistrationHandler extends SimpleChannelInboundHandler<FMLP
         }
     }
 
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "ChannelRegistrationHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeMessageHandler.java b/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeMessageHandler.java
index 008ae53512..545b6905a2 100644
--- a/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeMessageHandler.java
+++ b/src/main/java/cpw/mods/fml/common/network/handshake/HandshakeMessageHandler.java
@@ -1,5 +1,6 @@
 package cpw.mods.fml.common.network.handshake;
 
+import org.apache.logging.log4j.Level;
 import cpw.mods.fml.common.FMLLog;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
@@ -39,4 +40,11 @@ public class HandshakeMessageHandler<S extends Enum<S> & IHandshakeState<S>> ext
         S newState = state.accept(ctx, null);
         ctx.attr(fmlHandshakeState).set(newState);
     }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "HandshakeMessageHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
index 3d099b59f6..80878d265c 100644
--- a/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
+++ b/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
@@ -15,6 +15,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.Level;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.EnumConnectionState;
 import net.minecraft.network.INetHandler;
@@ -242,6 +243,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
         if ("FML|HS".equals(channelName) || "REGISTER".equals(channelName) || "UNREGISTER".equals(channelName))
         {
             FMLProxyPacket proxy = new FMLProxyPacket(msg);
+            proxy.setDispatcher(this);
             handshakeChannel.writeInbound(proxy);
             // forward any messages into the regular channel
             for (Object push : handshakeChannel.inboundMessages())
@@ -278,6 +280,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
         if ("FML|HS".equals(channelName) || "REGISTER".equals(channelName) || "UNREGISTER".equals(channelName))
         {
             FMLProxyPacket proxy = new FMLProxyPacket(msg);
+            proxy.setDispatcher(this);
             handshakeChannel.writeInbound(proxy);
             for (Object push : handshakeChannel.inboundMessages())
             {
@@ -433,4 +436,12 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
     {
         completeClientSideConnection(ConnectionType.valueOf(type));
     }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "NetworkDispatcher exception");
+        super.exceptionCaught(ctx, cause);
+    }
+
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/internal/EntitySpawnHandler.java b/src/main/java/cpw/mods/fml/common/network/internal/EntitySpawnHandler.java
index f11f3820ba..c17c2060d8 100644
--- a/src/main/java/cpw/mods/fml/common/network/internal/EntitySpawnHandler.java
+++ b/src/main/java/cpw/mods/fml/common/network/internal/EntitySpawnHandler.java
@@ -123,4 +123,11 @@ public class EntitySpawnHandler extends SimpleChannelInboundHandler<FMLMessage.E
             throw Throwables.propagate(e);
         }
     }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "EntitySpawnHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java b/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java
index 93087f8c24..3f8732125c 100644
--- a/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java
+++ b/src/main/java/cpw/mods/fml/common/network/internal/FMLProxyPacket.java
@@ -108,4 +108,9 @@ public class FMLProxyPacket extends Packet {
     {
         return this.dispatcher;
     }
+
+    public Side getTarget()
+    {
+        return target;
+    }
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java b/src/main/java/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java
index 37c3a56831..eb18dbcf56 100644
--- a/src/main/java/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java
+++ b/src/main/java/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java
@@ -1,5 +1,7 @@
 package cpw.mods.fml.common.network.internal;
 
+import org.apache.logging.log4j.Level;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.network.handshake.NetworkDispatcher;
 import cpw.mods.fml.common.network.internal.FMLMessage.CompleteHandshake;
 import io.netty.channel.ChannelHandlerContext;
@@ -14,4 +16,11 @@ public class HandshakeCompletionHandler extends SimpleChannelInboundHandler<FMLM
         NetworkDispatcher dispatcher = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER).getAndRemove();
         dispatcher.completeHandshake(msg.target);
     }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "HandshakeCompletionHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/internal/OpenGuiHandler.java b/src/main/java/cpw/mods/fml/common/network/internal/OpenGuiHandler.java
index cc5c254cd9..bacf9ff176 100644
--- a/src/main/java/cpw/mods/fml/common/network/internal/OpenGuiHandler.java
+++ b/src/main/java/cpw/mods/fml/common/network/internal/OpenGuiHandler.java
@@ -1,9 +1,11 @@
 package cpw.mods.fml.common.network.internal;
 
+import org.apache.logging.log4j.Level;
 import net.minecraft.entity.player.EntityPlayer;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.network.internal.FMLMessage.OpenGui;
 
 public class OpenGuiHandler extends SimpleChannelInboundHandler<FMLMessage.OpenGui> {
@@ -15,4 +17,11 @@ public class OpenGuiHandler extends SimpleChannelInboundHandler<FMLMessage.OpenG
         player.field_71070_bA.field_75152_c = msg.windowId;
     }
 
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "OpenGuiHandler exception");
+        super.exceptionCaught(ctx, cause);
+    }
+
 }
diff --git a/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java b/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java
index 593a4700b2..10d47c5a39 100644
--- a/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java
+++ b/src/main/java/cpw/mods/fml/common/network/simpleimpl/SimpleChannelHandlerWrapper.java
@@ -1,7 +1,9 @@
 package cpw.mods.fml.common.network.simpleimpl;
 
+import org.apache.logging.log4j.Level;
 import net.minecraft.network.INetHandler;
 import com.google.common.base.Throwables;
+import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.relauncher.Side;
 import io.netty.channel.ChannelHandlerContext;
@@ -33,4 +35,10 @@ public class SimpleChannelHandlerWrapper<REQ extends IMessage, REPLY extends IMe
         }
     }
 
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
+    {
+        FMLLog.log(Level.ERROR, cause, "SimpleChannelHandlerWrapper exception");
+        super.exceptionCaught(ctx, cause);
+    }
 }