diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index 32cf53ccc9..33fdc3db55 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -357,7 +357,6 @@ public class NetServer implements ApplicationListener{
             Log.info("&lc{0} has kicked {1}.", player.name, other.name);
         }else if(action == AdminAction.trace){
             TraceInfo info = new TraceInfo(other.con.address, other.uuid, other.con.modclient, other.con.mobile);
-            //TODO implement
             if(player.con != null){
                 Call.onTraceInfo(player.con.id, other, info);
             }else{
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 3d1fa9f8f2..fac648af51 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -775,6 +775,8 @@ public class ServerControl implements ApplicationListener{
                             socketOutput = null;
                         }
                     }
+                }catch(BindException b){
+                    err("Command input socket already in use. Is another instance of the server running?");
                 }catch(IOException e){
                     err("Terminating socket server.");
                     e.printStackTrace();