diff --git a/wifi-connect b/wifi-connect
index 6276fcf..494e39d 100755
--- a/wifi-connect
+++ b/wifi-connect
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -euo pipefail
+
 # Read SSID
 ssid=
 if [ -z "${1+x}" ]; then
@@ -18,8 +20,8 @@ fi
 timeout=$(( $(date +%s) + 60 ))
 info=
 while true; do
-	info=$(nmcli dev wifi list | grep "${ssid}")
-	if [[ ! -z "${info}" ]]; then
+	info=$(nmcli dev wifi list | grep "${ssid}" || true)
+	if [[ -n "${info}" ]]; then
 		break
 	else
 		current_time=$(date +%s)
@@ -50,7 +52,7 @@ if [[ $exit_code -eq 0 ]] ; then
 		echo -n "PASSWORD: " && read -r -s pass
 		nmcli c modify "${uuid}" wifi-sec.key-mgmt wpa-psk wifi-sec.psk "${pass}"
 	fi
-	
+
 	# Activate connection
 	nmcli c up "${uuid}"
 else