diff --git a/etc/wlan/shared b/etc/wlan/shared
index bb9939d..6352ebb 100644
--- a/etc/wlan/shared
+++ b/etc/wlan/shared
@@ -103,8 +103,10 @@ wlan_source_config_for_ssid ()
 {
 	# $1 == ssid[:BSSID]
 
-	ssid=`echo $1 | sed -ne 's/\(.*\)\(:..:..:..:..:..:..\).*/\1/p`
-	bssid=`echo $1 | sed -ne 's/\(.*\):\(..:..:..:..:..:..\).*/\2/p`
+	if [ X"$1" != X"" ] ; then
+		ssid=`echo $1 | sed -ne 's/\(.*\)\(:..:..:..:..:..:..\).*/\1/p`
+		bssid=`echo $1 | sed -ne 's/\(.*\):\(..:..:..:..:..:..\).*/\2/p`
+	fi
 
 	DesiredSSID="$ssid"
 	DesiredBSSID=$bssid
@@ -215,9 +217,9 @@ wlan_scan ()
 	done
 
 	if [ $bssfound = -1 ]; then
-		# didn't find what we were looking for
+		echo "didn't find what we were looking for"
 	else
-		# found it!  And here we join/autojoin..
+		echo "found it!  And here we join/autojoin.."
 	fi
 }