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