diff --git a/java/libraries/net/src/processing/net/Client.java b/java/libraries/net/src/processing/net/Client.java
index a93baa838..de39b6e9f 100644
--- a/java/libraries/net/src/processing/net/Client.java
+++ b/java/libraries/net/src/processing/net/Client.java
@@ -151,7 +151,7 @@ public class Client implements Runnable {
    * @usage application
    */
   public void stop() {    
-    if (disconnectEventMethod != null) {
+    if (disconnectEventMethod != null && thread != null){
       try {
         disconnectEventMethod.invoke(parent, new Object[] { this });
       } catch (Exception e) {
diff --git a/java/libraries/net/src/processing/net/Server.java b/java/libraries/net/src/processing/net/Server.java
index cdc81a386..bbf116917 100644
--- a/java/libraries/net/src/processing/net/Server.java
+++ b/java/libraries/net/src/processing/net/Server.java
@@ -109,12 +109,7 @@ public class Server implements Runnable {
    * @param client the client to disconnect
    */
   public void disconnect(Client client) {
-    //Calling client.stop() here would cause duplicate
-    //calls to disconnectEvent in the containing sketch,
-    //once for the stop() and once for the terminated connection.
-    //Instead just dispose of the client and let the terminated
-    //connection generate the disconnectEvent message;
-    client.dispose();
+    client.stop();
     int index = clientIndex(client);
     if (index != -1) {
       removeIndex(index);
@@ -220,8 +215,8 @@ public class Server implements Runnable {
     thread = null;
 
     if (clients != null) {
-      for (int i = 0; i < clientCount; i++) {
-        disconnect(clients[i]);
+      while(clientCount>0){
+        disconnect(clients[0]);
       }
       clientCount = 0;
       clients = null;