diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
index 77fa59d6c..a19119a08 100644
--- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
@@ -834,6 +834,7 @@ public class FMLClientHandler implements IFMLSidedHandler
     @Override
     public void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set<String> channelSet, String channel, Side side)
     {
+        waitForPlayClient();
         if (side == Side.CLIENT)
         {
             bus.post(new FMLNetworkEvent.CustomPacketRegistrationEvent<NetHandlerPlayClient>(manager, channelSet, channel, side, NetHandlerPlayClient.class));