SeleniumHQ
diff --git a/‎java/server/src/org/openqa/selenium/grid/commands/Standalone.java‎
Lines changed: 0 additions & 1 deletion b/‎java/server/src/org/openqa/selenium/grid/commands/Standalone.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎java/server/src/org/openqa/selenium/netty/server/NettyServer.java‎
Lines changed: 7 additions & 0 deletions b/‎java/server/src/org/openqa/selenium/netty/server/NettyServer.java‎
Lines changed: 7 additions & 0 deletions
@@ -56,7 +56,6 @@
 import org.openqa.selenium.remote.http.Route;
 import org.openqa.selenium.remote.tracing.Tracer;
 
-import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -40,6 +40,7 @@
 import javax.net.ssl.SSLException;
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.net.BindException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.security.cert.CertificateException;
@@ -134,6 +135,7 @@ public void stop() {
     }
   }
 
+  @SuppressWarnings("ConstantConditions")
   public NettyServer start() {
     ServerBootstrap b = new ServerBootstrap();
 
@@ -147,6 +149,11 @@ public NettyServer start() {
     } catch (InterruptedException e) {
       Thread.currentThread().interrupt();
       throw new UncheckedIOException(new IOException("Start up interrupted", e));
+    } catch (Exception e) {
+      if (e instanceof BindException) {
+        throw new UncheckedIOException(new IOException(String.format("Port %s already in use", port), e));
+      }
+      throw e;
     }
 
     return this;