diff --git a/meshuser.js b/meshuser.js
index 3f5e6e03..b74f607c 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -876,7 +876,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                     if (user.siteadmin != SITERIGHT_ADMIN) break;
 
                     // Only accept if the console is allowed for this domain
-                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.console !== true))) break;
+                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.console !== true))) break;
 
                     var r = '';
                     var cmdargs = splitArgs(command.value);
@@ -2826,7 +2826,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                 {
                     // Check the server version
                     if ((user.siteadmin & 16) == 0) break;
-                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.upgrade !== true))) break;
+                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) break;
                     //parent.parent.getLatestServerVersion(function (currentVersion, latestVersion) { try { ws.send(JSON.stringify({ action: 'serverversion', current: currentVersion, latest: latestVersion })); } catch (ex) { } });
                     parent.parent.getServerTags(function (tags, err) { try { ws.send(JSON.stringify({ action: 'serverversion', tags: tags })); } catch (ex) { } });
                     break;
@@ -2835,7 +2835,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                 {
                     // Perform server update
                     if ((user.siteadmin & 16) == 0) break;
-                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.upgrade !== true))) break;
+                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) break;
                     if ((command.version != null) && (typeof command.version != 'string')) break;
                     parent.parent.performServerUpdate(command.version);
                     break;
@@ -2844,7 +2844,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                 {
                     // Load the server error log
                     if ((user.siteadmin & 16) == 0) break;
-                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.errorlog !== true))) break;
+                    if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.errorlog !== true))) break;
                     fs.readFile(parent.parent.getConfigFilePath('mesherrors.txt'), 'utf8', function (err, data) { try { ws.send(JSON.stringify({ action: 'servererrors', data: data })); } catch (ex) { } });
                     break;
                 }
@@ -5026,7 +5026,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
             }
             case 'traceinfo': {
                 // Only accept if the tracing tab is allowed for this domain
-                if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.trace !== true))) break;
+                if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.trace !== true))) break;
 
                 if ((user.siteadmin === SITERIGHT_ADMIN) && (typeof command.traceSources == 'object')) {
                     parent.parent.debugRemoteSources = command.traceSources;