diff --git a/agents/MeshCentralRouter.exe b/agents/MeshCentralRouter.exe
index 4cf02879..d26accc1 100644
Binary files a/agents/MeshCentralRouter.exe and b/agents/MeshCentralRouter.exe differ
diff --git a/webserver.js b/webserver.js
index e4c54e55..957a5ba5 100644
--- a/webserver.js
+++ b/webserver.js
@@ -6262,7 +6262,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
                 obj.authenticate(req.query.user, req.query.pass, domain, function (err, userid, passhint, loginOptions) {
 
                     // Check if user as the "notools" site right. If so, deny this connection as tools are not allowed to connect.
-                    if ((user.siteadmin != 0xFFFFFFFF) && (user.siteadmin & SITERIGHT_NOMESHCMD)) {
+                    if ((user != null) && (user.siteadmin != 0xFFFFFFFF) && (user.siteadmin & SITERIGHT_NOMESHCMD)) {
                         // No tools allowed, close the websocket connection
                         parent.debug('web', 'ERR: Websocket no tools allowed');
                         try { ws.send(JSON.stringify({ action: 'close', cause: 'notools', msg: 'notools' })); ws.close(); } catch (e) { }