diff --git a/commander.html b/commander.html
index 36e0eee..ce92f74 100644
--- a/commander.html
+++ b/commander.html
@@ -153,6 +153,10 @@
 
       function addBoats(boats)
       {
+         if (boats == "")
+         {
+            return;
+         }
          boats = boats.split(':');
          for (let boat in boats)
          {
diff --git a/ground-station.py b/ground-station.py
index c071517..7751e4c 100644
--- a/ground-station.py
+++ b/ground-station.py
@@ -148,7 +148,10 @@ async def on_message(message, client):
 async def new_client(clientId, ws):
     """handler for every new client connection"""
     client = { "id": clientId, "boat": None, "ws": ws, "state": "active" }
-    print("new client connected: " + client['id'])
+    if client['id'] == ADMIN_ID:
+        print("new client connected: admin")
+    else:
+        print("new client connected: " + client['id'])
     for clie in Clients:
         if clie['id'] == client['id']:
             clie['state'] = 'terminated'