diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
index 8f484bbc7..108155c4d 100644
--- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
+++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
@@ -137,6 +137,7 @@ public class FMLCommonHandler
         }
 
         list.add(channelName);
+        modChannels.put(channelName, container);
     }
 
     /**
diff --git a/fml/server/cpw/mods/fml/server/FMLServerHandler.java b/fml/server/cpw/mods/fml/server/FMLServerHandler.java
index d4090db4d..e12cd4891 100644
--- a/fml/server/cpw/mods/fml/server/FMLServerHandler.java
+++ b/fml/server/cpw/mods/fml/server/FMLServerHandler.java
@@ -399,7 +399,9 @@ public class FMLServerHandler implements IFMLSidedHandler
         packet.field_44005_a = "REGISTER";
         packet.field_44004_c = FMLCommonHandler.instance().getPacketRegistry();
         packet.field_44003_b = packet.field_44004_c.length;
-        networkManager.func_745_a(packet);
+        if (packet.field_44003_b>0) {
+            networkManager.func_745_a(packet);
+        }
     }
 
     public void announceLogin(EntityPlayer player) {