Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 4796)
+++ trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java	(revision 4797)
@@ -2,5 +2,8 @@
 package org.openstreetmap.josm.io.remotecontrol;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.io.IOException;
+import java.net.BindException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -14,5 +17,4 @@
  * Taken from YWMS plugin by frsantos.
  */
-
 public class RemoteControlHttpServer extends Thread {
 
@@ -28,17 +30,16 @@
      * Starts or restarts the HTTP server
      */
-    public static void restartRemoteControlHttpServer()
-    {
-        try
-        {
-            if (instance != null)
+    public static void restartRemoteControlHttpServer() {
+        try {
+            if (instance != null) {
                 instance.stopServer();
+            }
 
-            int port = DEFAULT_PORT;
-            instance = new RemoteControlHttpServer(port);
+            instance = new RemoteControlHttpServer(DEFAULT_PORT);
             instance.start();
-        }
-        catch(IOException ioe)
-        {
+        } catch (BindException ex) {
+            System.err.println(tr("Warning: Cannot start remotecontrol server on port {0}: {1}",
+                    Integer.toString(DEFAULT_PORT), ex.getLocalizedMessage()));
+        } catch (IOException ioe) {
             ioe.printStackTrace();
         }
@@ -79,5 +80,5 @@
                 if( !server.isClosed() )
                     se.printStackTrace();
-            }
+                }
             catch (IOException ioe)
             {