Index: src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
===================================================================
--- src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 8965)
+++ src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(working copy)
@@ -101,8 +101,12 @@
                 Socket request = server.accept();
                 RequestProcessor.processRequest(request);
             } catch (SocketException se) {
-                if (!server.isClosed())
+                if (!server.isClosed()) {
                     Main.error(se);
+                } else {
+                    // stop the thread automatically if server is stopped
+                    return;
+                }
             } catch (IOException ioe) {
                 Main.error(ioe);
             }