diff --git a/ground-station.py b/ground-station.py
index 41b7a37..f6009ba 100644
--- a/ground-station.py
+++ b/ground-station.py
@@ -46,10 +46,13 @@ async def echo_clients(client):
     if client['id'] == ADMIN_ID:
         data = "clients:"
         for clie in Clients:
+            clientId = clie['id']
             if (clie['id'] == ADMIN_ID):
-                data += "admin;" + str(clie['boat']) + ";" + str(clie['state']) + ":"
-            else:
-                data += str(clie['id']) + ";" + str(clie['boat']) + ";" + str(clie['state']) + ":"
+                clientId = "admin"
+            boatId = "----"
+            if (clie['boat'] is not None):
+                boatId = clie['boat']['id']
+            data += clientId + ";" + boatId + ";" + str(clie['state']) + ":"
         await client['ws'].send(data + '\n')
 
 async def take_controll(client, boat):