diff --git a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
index 687ebc43c5..205df801cd 100644
--- a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
+++ b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
@@ -259,8 +259,11 @@ public class FMLNetworkHandler
     {
         Map<String, ModContainer> mods = Loader.instance().getIndexedModList();
         NetworkModHandler handler = findNetworkModHandler(mods.get(key));
-        handler.setNetworkId(value);
-        networkIdLookup.put(value, handler);
+        if (handler != null)
+        {
+            handler.setNetworkId(value);
+            networkIdLookup.put(value, handler);
+        }
     }
 
     public static void onClientConnectionToRemoteServer(NetHandler netClientHandler, String server, int port, NetworkManager networkManager)