diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index 7b686331..633a9820 100644
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index 0743fac3..46096208 100644
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
diff --git a/agents/meshcmd.js b/agents/meshcmd.js
index 67c8b90a..62002ded 100644
--- a/agents/meshcmd.js
+++ b/agents/meshcmd.js
@@ -331,18 +331,26 @@ function run(argv) {
         amtMei.getVersion(function (val) { for (var version in val.Versions) { if (val.Versions[version].Description == 'AMT') { mestate.ver = val.Versions[version].Version; } } });
         amtMei.getProvisioningState(function (result) { mestate.ProvisioningState = result; });
         amtMei.getProvisioningMode(function (result) { mestate.ProvisioningMode = result; });
-        amtMei.getEHBCState(function (result) { mestate.ehbc = result; });
-        amtMei.getControlMode(function (result) { mestate.controlmode = result; });
-        amtMei.getMACAddresses(function (result) { mestate.mac = result; });
-        amtMei.getLanInterfaceSettings(0, function (result) { mestate.net0 = result; });
-        amtMei.getLanInterfaceSettings(1, function (result) { mestate.net1 = result; });
+        amtMei.getEHBCState(function (result) { if (result) { mestate.ehbc = result; } });
+        amtMei.getControlMode(function (result) { if (result) { mestate.controlmode = result; } });
+        amtMei.getMACAddresses(function (result) { if (result) { mestate.mac = result; } });
+        amtMei.getLanInterfaceSettings(0, function (result) { if (result) { mestate.net0 = result; } });
+        amtMei.getLanInterfaceSettings(1, function (result) { if (result) { mestate.net1 = result; } });
         amtMei.getUuid(function (result) { if ((result != null) && (result.uuid != null)) { mestate.uuid = result.uuid; } });
         amtMei.getDnsSuffix(function (result) {
             mestate.dns = result;
             var str = 'Intel AMT v' + mestate.ver;
             if (mestate.ProvisioningState.stateStr == 'PRE') { str += ', pre-provisioning state'; }
             else if (mestate.ProvisioningState.stateStr == 'IN') { str += ', in-provisioning state'; }
-            else if (mestate.ProvisioningState.stateStr == 'POST') { if (mestate.ProvisioningMode.modeStr == 'ENTERPRISE') { str += ', activated in ' + ["none", "client control mode", "admin control mode", "remote assistance mode"][mestate.controlmode.controlMode]; } else { str += ', activated in ' + mestate.ProvisioningMode.modeStr; } }
+            else if (mestate.ProvisioningState.stateStr == 'POST') {
+                if (mestate.ProvisioningMode) {
+                    if (mestate.controlmode) {
+                        if (mestate.ProvisioningMode.modeStr == 'ENTERPRISE') { str += ', activated in ' + ["none", "client control mode", "admin control mode", "remote assistance mode"][mestate.controlmode.controlMode]; } else { str += ', activated in ' + mestate.ProvisioningMode.modeStr; }
+                    } else {
+                        str += ', activated in ' + mestate.ProvisioningMode.modeStr;
+                    }
+                }
+            }
             if ((mestate.ehbc) && (mestate.ehbc.EHBC == true)) { str += ', EHBC enabled'; }
             str += '.';
             if (mestate.net0 != null) { str += '\r\nWired ' + ((mestate.net0.enabled == 1) ? 'Enabled' : 'Disabled') + ((mestate.net0.dhcpEnabled == 1) ? ', DHCP' : ', Static') + ', ' + mestate.net0.mac + (mestate.net0.address == '0.0.0.0' ? '' : (', ' + mestate.net0.address)); }
diff --git a/agents/meshcore.js b/agents/meshcore.js
index fd8cdeee..3548343d 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -1253,7 +1253,7 @@ function createMeshCore(agent) {
                 var intelamt = {}, p = false;
                 if (meinfo.Versions && meinfo.Versions.AMT) { intelamt.ver = meinfo.Versions.AMT; p = true; }
                 if (meinfo.ProvisioningState) { intelamt.state = meinfo.ProvisioningState; p = true; }
-                if (meinfo.flags) { intelamt.flags = meinfo.Flags; p = true; }
+                if (meinfo.Flags) { intelamt.flags = meinfo.Flags; p = true; }
                 if (meinfo.OsHostname) { intelamt.host = meinfo.OsHostname; p = true; }
                 if (meinfo.UUID) { intelamt.uuid = meinfo.UUID; p = true; }
                 if (p == true) { r.intelamt = intelamt }
@@ -1298,7 +1298,7 @@ function createMeshCore(agent) {
         amtMei.getProvisioningMode(function (result) { amtMeiTmpState.ProvisioningMode = result.mode; });
         amtMei.getProvisioningState(function (result) { amtMeiTmpState.ProvisioningState = result.state; });
         amtMei.getEHBCState(function (result) { if ((result != null) && (result.EHBC == true)) { amtMeiTmpState.Flags += 1; } });
-        amtMei.getControlMode(function (result) { if (result.controlMode == 1) { amtMeiTmpState.Flags += 2; } if (result.controlMode == 2) { amtMeiTmpState.Flags += 4; } });
+        amtMei.getControlMode(function (result) { if (result != null) { if (result.controlMode == 1) { amtMeiTmpState.Flags += 2; } if (result.controlMode == 2) { amtMeiTmpState.Flags += 4; } } });
         amtMei.getUuid(function (result) { if ((result != null) && (result.uuid != null)) { amtMeiTmpState.UUID = result.uuid; } });
         //amtMei.getMACAddresses(function (result) { amtMeiTmpState.mac = result; });
         amtMei.getDnsSuffix(function (result) { if (result != null) { amtMeiTmpState.dns = result; } if (func != null) { func(amtMeiTmpState); } });
diff --git a/package.json b/package.json
index e33bee64..6a5b7858 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.1.6-w",
+  "version": "0.1.6-y",
   "keywords": [
     "Remote Management",
     "Intel AMT",
diff --git a/views/default.handlebars b/views/default.handlebars
index 157cc408..f674f059 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -2809,8 +2809,12 @@
                 if (node.intelamt != null) {
                     var str = '';
                     var provisioningStates = { 0: 'Not Activated (Pre)', 1: 'Not Activated (In)', 2: 'Activated' };
-                    if (node.intelamt.ver == null || node.intelamt.state == null) { str += '<i>Unknown Version & State</i>'; } else { str += (provisioningStates[node.intelamt.state] + ', v' + node.intelamt.ver); }
-                    if (node.intelamt.tls == 1) { str += ', TLS'; }
+                    if (node.intelamt.ver == null || node.intelamt.state == null) { str += '<i>Unknown Version & State</i>'; } else {
+                        str += provisioningStates[node.intelamt.state];
+                        if (node.intelamt.flags) { if (node.intelamt.flags & 2) { str += ' <span title="Intel AMT is activated in Client Control Mode">CCM</span>'; } else if (node.intelamt.flags & 4) { str += ' <span title="Intel AMT is activated in Admin Control Mode">ACM</span>'; } }
+                        str += (', v' + node.intelamt.ver);
+                    }
+                    if (node.intelamt.tls == 1) { str += ', <span  title="Intel AMT is setup with TLS network security">TLS</span>'; }
                     if (node.intelamt.user == null || node.intelamt.user == '') {
                         if ((meshrights & 4) != 0) {
                             str += ', <i style=color:#FF0000;cursor:pointer title="Edit Intel&reg; AMT credentials" onclick=editDeviceAmtSettings("' + node._id + '")>No Credentials</i>';