diff --git a/meshagent.js b/meshagent.js
index aa3a2a95..64bca3aa 100644
--- a/meshagent.js
+++ b/meshagent.js
@@ -393,7 +393,7 @@ module.exports.CreateMeshAgent = function (parent, db, ws, req, args, domain) {
                 case 'location':
                     {
                         // Sent by the agent to update location information
-                        if ((command.type == 'publicip') && (typeof command.value == 'object') && (command.value.ip) && (command.value.loc)) {
+                        if ((command.type == 'publicip') && (command.value != null) && (typeof command.value == 'object') && (command.value.ip) && (command.value.loc)) {
                             var x = {};
                             x.publicip = command.value.ip;
                             x.iploc = command.value.loc;
diff --git a/package.json b/package.json
index 2caa2562..8efd4f32 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.0.6-t",
+  "version": "0.0.6-u",
   "keywords": [
     "Remote Management",
     "Intel AMT",