diff --git a/GPN_BadgeLasertag.ino b/GPN_BadgeLasertag.ino
index 13c5dcb5ea57bcb49e8168a7fb1b56dbb6b189e5..f7ffc04735a9475e15379cdae6f2f6287b18472f 100644
--- a/GPN_BadgeLasertag.ino
+++ b/GPN_BadgeLasertag.ino
@@ -154,7 +154,9 @@ void joinGame() {
     ip = irinput.substring(1, irinput.length() - 1);
     unsigned short firstA = ip.indexOf('a');
     Serial.printf("firstA: %d\n", firstA);
-    ip = ip.substring(firstA, ip.length());
+    if (firstA < 65535) {
+        ip = ip.substring(firstA, ip.length());
+    }
     Serial.printf("Received ip: >%s<\n", ip.c_str());
 
     client = new GameClient(ui, &badge, player);
@@ -166,7 +168,7 @@ void joinGame() {
 }
 
 void loop() {
-    Serial.println("Loop");
+    //Serial.println("Loop");
     ui->dispatchInput(badge.getJoystickState());
     ui->draw();
 
@@ -194,7 +196,7 @@ void loop() {
     if (client) {
 //        client->update();
     }
-    Serial.println("Loop - Ende");
+    //Serial.println("Loop - Ende");
 }
 
 char *loadNick() {