diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/ChatComponent.java b/src/main/java/de/bixilon/minosoft/game/datatypes/ChatComponent.java
index 1e66dfea1..59b931583 100644
--- a/src/main/java/de/bixilon/minosoft/game/datatypes/ChatComponent.java
+++ b/src/main/java/de/bixilon/minosoft/game/datatypes/ChatComponent.java
@@ -19,6 +19,7 @@ import org.json.JSONObject;
 
 public class ChatComponent {
     JSONObject json;
+    //ToDo
 
     public ChatComponent(String raw) {
         try {
diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
index aea499fe1..b33e1772f 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
@@ -137,7 +137,11 @@ public class Connection {
             while (getConnectionState() != ConnectionState.DISCONNECTED) {
                 while (handlingQueue.size() > 0) {
                     handlingQueue.get(0).log();
-                    handlingQueue.get(0).handle(getHandler());
+                    try {
+                        handlingQueue.get(0).handle(getHandler());
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                     handlingQueue.remove(0);
                 }
                 Util.sleep(1);