diff --git a/src/main/java/de/bixilon/minosoft/logging/Log.java b/src/main/java/de/bixilon/minosoft/logging/Log.java
index f119f9fd2..dba1ee85d 100644
--- a/src/main/java/de/bixilon/minosoft/logging/Log.java
+++ b/src/main/java/de/bixilon/minosoft/logging/Log.java
@@ -69,6 +69,7 @@ public class Log {
 
             }
         });
+        logThread.setName("Log-Thread");
         logThread.start();
     }
 
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 4f0598bd0..e40937d8f 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
@@ -164,7 +164,7 @@ public class Connection {
 
     private void startHandlingThread() {
         handleThread = new Thread(() -> {
-            while (getConnectionState() != ConnectionState.DISCONNECTED) {
+            while (getConnectionState() != ConnectionState.DISCONNECTING) {
                 while (handlingQueue.size() > 0) {
                     try {
                         handlingQueue.get(0).log();
@@ -182,6 +182,7 @@ public class Connection {
                 }
             }
         });
+        handleThread.setName("Handle-Thread");
         handleThread.start();
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
index ce204d11d..32207def8 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
@@ -119,6 +119,7 @@ public class Network {
                 e.printStackTrace();
             }
         });
+        socketThread.setName("Socket-Thread");
         socketThread.start();
     }
 
@@ -129,7 +130,7 @@ public class Network {
         // sleep 1 ms
         packetThread = new Thread(() -> {
             // compressed data, makes packets to binary data
-            while (connection.getConnectionState() != ConnectionState.DISCONNECTED) {
+            while (connection.getConnectionState() != ConnectionState.DISCONNECTING) {
 
                 while (queue.size() > 0) {
                     ServerboundPacket p = queue.get(0);
@@ -242,6 +243,7 @@ public class Network {
 
             }
         });
+        packetThread.setName("Packet-Thread");
         packetThread.start();
     }