diff --git a/forge/forge_common/net/minecraft/src/forge/MessageManager.java b/forge/forge_common/net/minecraft/src/forge/MessageManager.java
index 3880172ce..1a7e38217 100644
--- a/forge/forge_common/net/minecraft/src/forge/MessageManager.java
+++ b/forge/forge_common/net/minecraft/src/forge/MessageManager.java
@@ -406,6 +406,11 @@ public class MessageManager
 
     public void dispatchIncomingMessage(NetworkManager manager, String channel, byte[] data)
     {
+        if (data == null)
+        {
+            data = new byte[0];
+        }
+        
         if (channel.equals("Forge"))
         {
             if (ForgeHooks.getPacketHandler() != null)