Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 14216)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java	(revision 14217)
@@ -417,4 +417,7 @@
                 if (!server.isClosed()) {
                     Logging.error(e);
+                } else {
+                    // stop the thread automatically if server is stopped
+                    return;
                 }
             } catch (IOException ioe) {