From 39feb03e1f56d1f3ad41f0e4bd5ca55c8f1627ec Mon Sep 17 00:00:00 2001
From: betasteward <betasteward@gmail.com>
Date: Tue, 22 Sep 2015 09:46:43 -0400
Subject: [PATCH] improve messaging when server is already started

---
 Mage.Server/src/main/java/mage/server/ServerMain.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Mage.Server/src/main/java/mage/server/ServerMain.java b/Mage.Server/src/main/java/mage/server/ServerMain.java
index c55ef761bcc..bc93bb64289 100644
--- a/Mage.Server/src/main/java/mage/server/ServerMain.java
+++ b/Mage.Server/src/main/java/mage/server/ServerMain.java
@@ -31,6 +31,7 @@ package mage.server;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.Serializable;
+import java.net.BindException;
 import java.net.MalformedURLException;
 import java.util.List;
 import java.util.Locale;
@@ -195,7 +196,11 @@ public class ServerMain implements MageServer {
             instance = new ServerMain(adminPassword, testMode);
             server = new Server(instance);
             server.start(config.getPort(), config.isUseSSL());
-        } catch (Exception ex) {
+        }
+        catch (BindException ex) {
+            logger.fatal("Failed to start server - " + config.getServerName() + " : check that another server is not already running", ex);
+        }
+        catch (Exception ex) {
             logger.fatal("Failed to start server - " + config.getServerName(), ex);
         }