diff --git a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
index cc66486a8..e1ae89970 100644
--- a/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
+++ b/src/main/java/de/bixilon/minosoft/gui/main/ServerListCell.java
@@ -241,9 +241,9 @@ public class ServerListCell extends ListCell<Server> implements Initializable {
     }
 
     public void delete() {
-        listView.getItems().remove(server);
         server.delete();
         Log.info(String.format("Deleted server (name=\"%s\", address=\"%s\")", server.getName(), server.getAddress()));
+        listView.getItems().remove(server);
     }
 
     public void connect() {
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 391a4f03a..8b32b9809 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/Network.java
@@ -235,7 +235,9 @@ public class Network {
                 // Could not connect
                 lastException = e;
                 connection.setConnectionState(ConnectionStates.FAILED);
-                socketSThread.interrupt();
+                if (socketSThread != null) {
+                    socketSThread.interrupt();
+                }
                 e.printStackTrace();
             }
         });