diff --git a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java
index 48286fcb5e..8a68014f45 100644
--- a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java
+++ b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java
@@ -85,11 +85,23 @@ public class NetworkRegistry
      */
     public void registerChannel(IPacketHandler handler, String channelName)
     {
+        if (Strings.isNullOrEmpty(channelName) || (channelName!=null && channelName.length()>16))
+        {
+            FMLLog.severe("Invalid channel name '%s' : %s", channelName, Strings.isNullOrEmpty(channelName) ? "Channel name is empty" : "Channel name is too long (16 chars is maximum)");
+            throw new RuntimeException("Channel name is invalid");
+
+        }
         universalPacketHandlers.put(channelName, handler);
     }
 
     public void registerChannel(IPacketHandler handler, String channelName, Side side)
     {
+        if (Strings.isNullOrEmpty(channelName) || (channelName!=null && channelName.length()>16))
+        {
+            FMLLog.severe("Invalid channel name '%s' : %s", channelName, Strings.isNullOrEmpty(channelName) ? "Channel name is empty" : "Channel name is too long (16 chars is maximum)");
+            throw new RuntimeException("Channel name is invalid");
+
+        }
         if (side.isClient())
         {
             clientPacketHandlers.put(channelName, handler);