diff --git a/agents/meshcore.js b/agents/meshcore.js
index 0302917a..071d0a6f 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -4382,6 +4382,8 @@ function createMeshCore(agent)
                     // Check that the certificate is the one expected by the server, fail if not.
                     if (checkServerIdentity.servertlshash == null)
                     {
+                        if (require('MeshAgent').ServerInfo == null || require('MeshAgent').ServerInfo.ControlChannelCertificate == null) { return; }
+
                         sendConsoleText('Self Update failed, because the url cannot be verified', sessionid);
                         sendAgentMessage('Self Update failed, because the url cannot be verified', 3);
                         throw new Error('BadCert');