Index: sources/device/DeviceController.cpp
===================================================================
diff -u -r3f24acee28d26034c018241f9beb35fb4887c143 -rbabe585dd9603621275742b07135c0fd4181802f
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision babe585dd9603621275742b07135c0fd4181802f)
@@ -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 from WiFi.");
     emit didAttributeResponse(model.data());
 }
 
Index: sources/device/DeviceView.cpp
===================================================================
diff -u -r3f24acee28d26034c018241f9beb35fb4887c143 -rbabe585dd9603621275742b07135c0fd4181802f
--- sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
+++ sources/device/DeviceView.cpp	(.../DeviceView.cpp)	(revision babe585dd9603621275742b07135c0fd4181802f)
@@ -352,8 +352,8 @@
 
     // the Freq, Rate units
     QString mSSID;
-const QString mFREQ_Unit  = " MHz";
-const QString mRATE_Unit  = " Mbit/s";
+    const QString mFREQ_Unit  = " MHz";
+    const QString mRATE_Unit  = " Mbit/s";
     // Removing the units once from the result to accelerate parsing. (will be added when done)
     mResult.remove(mFREQ_Unit);
     mResult.remove(mRATE_Unit);
@@ -553,18 +553,19 @@
     QString  mResult = vResult;
     QStringList fields = mResult.split(',');
 
-    if (fields.size() < eCount)
+    if (fields.size() < eCount) {
+        status   (tr("The WiFi info response error"));
+        LOG_DEBUG(QStringLiteral("The WiFi info response length is not correct [%1 of %2]").arg(len).arg(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);
-        for (QString& s : dnsList)
-            s = s.trimmed();
-        dns(dnsList.join('\n'));
+        dns(dnsList.trimmed().join('\n'));
     }
     else {
         ssid("");
Index: sources/device/DeviceView.h
===================================================================
diff -u -r3f24acee28d26034c018241f9beb35fb4887c143 -rbabe585dd9603621275742b07135c0fd4181802f
--- sources/device/DeviceView.h	(.../DeviceView.h)	(revision 3f24acee28d26034c018241f9beb35fb4887c143)
+++ sources/device/DeviceView.h	(.../DeviceView.h)	(revision babe585dd9603621275742b07135c0fd4181802f)
@@ -119,12 +119,9 @@
     READONLY    ( bool          , decommissionEnabled , true                     )
 
     ATTRIBUTE   ( QStringList   , wifiList            , {}, WifiList             )
-    READONLY    ( bool          , wifiListEnabled     , true                     )
-
     ATTRIBUTE   ( QStringList   , wifiInfo            , {}, WifiInfo             )
-
     ATTRIBUTE   ( bool          , wifiConnect         , false, WifiConnect       )
-
+    READONLY    ( bool          , wifiListEnabled     , true                     )
     READONLY    ( QString       , ssid                , ""                       )
     READONLY    ( QString       , ipAddress           , ""                       )
     READONLY    ( QString       , gateway             , ""                       )