diff --git a/src/set_wifi.c b/src/set_wifi.c
index 977ed27b..9504bb25 100644
--- a/src/set_wifi.c
+++ b/src/set_wifi.c
@@ -126,30 +126,46 @@ void set_wifi_password(void)
 void set_wifi_scan(void)
 {
   char i;
+  unsigned char valid_networks = 0;
+  SSIDInfo *ssid_info;
   screen_set_wifi(io_get_adapter_config());
 
 
   numNetworks = io_scan_for_networks();
 
   if (numNetworks > 16)
-    numNetworks = 16;
+	  numNetworks = 16;
 
   if (io_error())
+  {
+	  screen_error("COULD NOT WS_SCAN NETWORKS");
+	  die(); // to do retry or something instead
+  }
+
+  for (i = 0; i < numNetworks; i++)
+  {
+    ssid_info = io_get_scan_result(i);
+    if (ssid_info != NULL && ssid_info->ssid != NULL & strlen(ssid_info->ssid) != 0)
     {
-      screen_error("COULD NOT WS_SCAN NETWORKS");
-      die(); // to do retry or something instead
+      screen_set_wifi_display_ssid(i, ssid_info);
+      valid_networks++;
     }
-
-  for (i=0;i<numNetworks;i++)
+    else
     {
-      screen_set_wifi_display_ssid(i,io_get_scan_result(i));
+      break;
     }
+  }
 
-  ws_subState=WS_SELECT;
+  numNetworks = valid_networks;
+
+  ws_subState = WS_SELECT;
 }
 
 void set_wifi_done(void)
 {
+#ifdef _CMOC_VERSION_  
+  locate(0,14);
+#endif
   int result = io_set_ssid(&nc);
   // always (good or bad) go to connect_wifi.
   // I had used result to only show this when we have good return, but