diff --git a/src/freedombone-mesh b/src/freedombone-mesh
index ed6000bc..05e2d56d 100755
--- a/src/freedombone-mesh
+++ b/src/freedombone-mesh
@@ -69,6 +69,11 @@ done < "$PEERS_FILE"
 peer_index=0
 read peer_index
 
+# if no selection made
+if [ ! $peer_index ]; then
+    exit 0
+fi
+
 # get the avahi domain name
 AVAHI_DOMAIN=
 idx=1
@@ -92,9 +97,6 @@ if [ ! -f /usr/bin/irssi ]; then
         exit 3
     fi
 fi
-
-MESH_RUNNING=$(pgrep ngircd > /dev/null && echo Running)' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
-
 irssi -c $AVAHI_DOMAIN -p $IRC_PORT -n $USER
 
 exit 0