diff --git a/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java b/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java
index 2dcb4771..be3f75ef 100755
--- a/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/chat/ChatMessageHandler.java
@@ -31,16 +31,17 @@ public class ChatMessageHandler {
                             if(!alive) {
                                 break;
                             }
-                            try {
-                                Thread.sleep(100);
-                                player = Minecraft.getMinecraft().thePlayer;
-                            } catch(Exception e) {
-                            }
+                            Thread.sleep(100);
+                            player = Minecraft.getMinecraft().thePlayer;
                         }
 
-                        player.addChatComponentMessage(requests.poll());
+                        IChatComponent message = requests.poll();
+                        if (message != null) {
+                            player.addChatComponentMessage(message);
+                        }
                         Thread.sleep(100);
                     } catch(Exception e) {
+                        e.printStackTrace();
                     }
                 }