Index: sources/device/DeviceController.cpp
===================================================================
diff -u -ra2a273600d25e863214833ead3324a63fb4759f1 -r3f24acee28d26034c018241f9beb35fb4887c143
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision a2a273600d25e863214833ead3324a63fb4759f1)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
@@ -1126,7 +1126,7 @@
     MDeviceWifiConnectResponse model;
     model._data.mConnect  = vData.mConnect;
     model._data.mAccepted  = false;
-    model._data.mMessage   = vData.mConnect ? tr("Connecting to Wifi.") : tr("Disconnecting to Wifi.");
+    model._data.mMessage   = vData.mConnect ? tr("Connecting to WiFi.") : tr("Disconnecting to WiFi.");
     emit didAttributeResponse(model.data());
 }
 
Index: sources/device/DeviceError.cpp
===================================================================
diff -u -ra2a273600d25e863214833ead3324a63fb4759f1 -r3f24acee28d26034c018241f9beb35fb4887c143
--- sources/device/DeviceError.cpp	(.../DeviceError.cpp)	(revision a2a273600d25e863214833ead3324a63fb4759f1)
+++ sources/device/DeviceError.cpp	(.../DeviceError.cpp)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
@@ -57,7 +57,7 @@
     QT_TR_NOOP("The WiFi scan failed."                      ), // eDevice_WifiList_Error
     QT_TR_NOOP("The WiFi info failed."                      ), // eDevice_WifiInfo_Error
     QT_TR_NOOP("The Connect WiFi failed."                   ), // eDevice_WifiConnect_Error
-    QT_TR_NOOP("The Disconnect WiFi failed."                 ), // eDevice_WifiDisconnect_Error
+    QT_TR_NOOP("The Disconnect WiFi failed."                ), // eDevice_WifiDisconnect_Error
     QT_TR_NOOP("The USB Mount failed."                      ), // eDevice_USBMount_Error
 };
 
Index: sources/device/DeviceModels.h
===================================================================
diff -u -ra2a273600d25e863214833ead3324a63fb4759f1 -r3f24acee28d26034c018241f9beb35fb4887c143
--- sources/device/DeviceModels.h	(.../DeviceModels.h)	(revision a2a273600d25e863214833ead3324a63fb4759f1)
+++ sources/device/DeviceModels.h	(.../DeviceModels.h)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
@@ -442,9 +442,9 @@
 class MDeviceWifiConnectRequest : public MDeviceRequestBase {
 public:
     struct Data {
-    bool    mConnect  = true;   // set true = connect/ false = disconnect
+    bool    mConnect    = true;   // set true = connect/ false = disconnect
     QString mSsid       = ""  ;
-    QString mPassword       = ""  ;
+    QString mPassword   = ""  ;
     } _data;
 
     QString toString() {
Index: sources/device/DeviceView.cpp
===================================================================
diff -u -ra2a273600d25e863214833ead3324a63fb4759f1 -r3f24acee28d26034c018241f9beb35fb4887c143
--- sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision a2a273600d25e863214833ead3324a63fb4759f1)
+++ sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
@@ -364,7 +364,7 @@
         QString mRSN_FLAGS;
 
         QStringList fields = lines[row].split(',');
-//        qDebug() << fields.join("-");
+        // DEBUG: qDebug() << fields.join("-");
         // this will never fail since even an empty string in split at least has index 0=eSSID;
         mSSID = fields[eSSID].trimmed();
         if ( mSSID.isEmpty() ) continue; //hidden networks, or an incorrect entry
@@ -432,6 +432,7 @@
         data.mWifiSignalLevel   = ssid.mSIGNAL_Max;
         data.mWifiSupported     = ssid.mSupported;
         data.mWifiConnected     = ssid.mInUse ;
+
         dataAppend( data, ssid.mInUse, ssid.mSupported);
     }
 }
@@ -466,10 +467,6 @@
         case eRole_WifiSignalLevel      : return dataList.mWifiSignalLevel      ;
         case eRole_WifiSupported        : return dataList.mWifiSupported        ;
         case eRole_WifiConnected        : return dataList.mWifiConnected        ;
-        case eRole_WifiIpAddress        : return dataList.mWifiIpAddress         ;
-        case eRole_WifiGateway          : return dataList.mWifiGateway           ;
-        case eRole_WifiSubnetMask       : return dataList.mWifiSubnetMask        ;
-        case eRole_WifiDns              : return dataList.mWifiDns               ;
 
         // ----- Bluetooth
         case eRole_BLE_UNUSED           : return "<unused>";                    ;
@@ -497,7 +494,6 @@
     }
 
     // explicitly emit a dataChanged signal to notify anybody bound to this property (vRole)
-//    emit dataChanged(vIndex, vIndex, {vRole});
     emit dataChanged(vIndex, vIndex, QVector<int>(1, vRole));
     return true;
 }
@@ -551,18 +547,24 @@
         eSUBNETMASK     ,
         eGATEWAY        ,
         eDNS            ,
+        eCount          ,
     };
 
     QString  mResult = vResult;
     QStringList fields = mResult.split(',');
 
+    if (fields.size() < eCount)
+        return;
+
     if (! fields[eSSID].trimmed().isEmpty()) {
         ssid(fields[eSSID].trimmed());
         ipAddress(fields[eIPADDRESS].trimmed());
         subnetMask(fields[eSUBNETMASK].trimmed());
         gateway(fields[eGATEWAY].trimmed());
         QStringList dnsList = fields.mid(eDNS);
-        dns(dnsList.join('\n').trimmed());
+        for (QString& s : dnsList)
+            s = s.trimmed();
+        dns(dnsList.join('\n'));
     }
     else {
         ssid("");
Index: sources/device/DeviceView.h
===================================================================
diff -u -ra2a273600d25e863214833ead3324a63fb4759f1 -r3f24acee28d26034c018241f9beb35fb4887c143
--- sources/device/DeviceView.h	(.../DeviceView.h)	(revision a2a273600d25e863214833ead3324a63fb4759f1)
+++ sources/device/DeviceView.h	(.../DeviceView.h)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
@@ -47,10 +47,6 @@
         eRole_WifiSignalLevel               ,
         eRole_WifiSupported                 ,
         eRole_WifiConnected                 ,
-        eRole_WifiIpAddress                 ,
-        eRole_WifiGateway                   ,
-        eRole_WifiSubnetMask                ,
-        eRole_WifiDns                       ,
 
         // ----- Bluetooth
         eRole_BLE_UNUSED                    ,
@@ -64,10 +60,6 @@
         { eRole_WifiSignalLevel             , "wifiSignalLevel"   },
         { eRole_WifiSupported               , "wifiSupported"     },
         { eRole_WifiConnected               , "wifiConnected"     },
-        { eRole_WifiIpAddress               , "wifiIpAddress"     },
-        { eRole_WifiGateway                 , "wifiGateway"       },
-        { eRole_WifiSubnetMask              , "wifiSubnetMask"    },
-        { eRole_WifiDns                     , "wifiDns"           },
         // ----- Bluetooth
     };