diff --git a/app/static/js/CorpusAnalysis/CorpusAnalysisApp.js b/app/static/js/CorpusAnalysis/CorpusAnalysisApp.js
index 2d69fed7..d6274f32 100644
--- a/app/static/js/CorpusAnalysis/CorpusAnalysisApp.js
+++ b/app/static/js/CorpusAnalysis/CorpusAnalysisApp.js
@@ -25,22 +25,21 @@ class CorpusAnalysisApp {
   async init() {
     this.disableActionElements();
     this.elements.m.initModal.open();
-
-    const statusTextElement = this.elements.initModal.querySelector('.status-text');
-
-    // Setup CQi over SocketIO connection and gather data from the CQPServer
+  
     try {
+      // Setup CQi over SocketIO connection and gather data from the CQPServer
+      const statusTextElement = this.elements.initModal.querySelector('.status-text');
       statusTextElement.innerText = 'Creating CQi over SocketIO client...';
       const cqiClient = new cqi.CQiClient('/cqi_over_sio');
       statusTextElement.innerText += ' Done';
-      statusTextElement.innerHTML += '<br>Waiting for the CQP server...';
+      statusTextElement.innerHTML = 'Waiting for the CQP server...';
       const response = await cqiClient.api.socket.emitWithAck('init', this.corpusId);
       if (response.code !== 200) {throw new Error();}
       statusTextElement.innerText += ' Done';
-      statusTextElement.innerHTML += '<br>Connecting to the CQP server...';
+      statusTextElement.innerHTML = 'Connecting to the CQP server...';
       await cqiClient.connect('anonymous', '');
       statusTextElement.innerText += ' Done';
-      statusTextElement.innerHTML += '<br>Building and receiving corpus data cache from the server (This may take a while)...';
+      statusTextElement.innerHTML = 'Building and receiving corpus data cache from the server (This may take a while)...';
       const cqiCorpus = await cqiClient.corpora.get(`NOPAQUE-${this.corpusId.toUpperCase()}`);
       statusTextElement.innerText += ' Done';
       // TODO: Don't do this hgere
@@ -48,11 +47,21 @@ class CorpusAnalysisApp {
       this.data.cqiClient = cqiClient;
       this.data.cqiCorpus = cqiCorpus;
       this.data.corpus = {o: cqiCorpus};  // legacy
+      // Initialize extensions
+      for (const extension of Object.values(this.extensions)) {
+        statusTextElement.innerHTML = `Initializing ${extension.name} extension...`;
+        await extension.init();
+        statusTextElement.innerText += ' Done'
+      }
     } catch (error) {
       let errorString = '';
-      if ('code' in error) {errorString += `[${error.code}] `;}
+      if ('code' in error && error.code !== undefined && error.code !== null) {
+        errorString += `[${error.code}] `;
+      }
       errorString += `${error.constructor.name}`;
-      if ('description' in error) {errorString += `: ${error.description}`;}
+      if ('description' in error && error.description !== undefined && error.description !== null) {
+        errorString += `: ${error.description}`;
+      }
       const errorsElement = this.elements.initModal.querySelector('.errors');
       const progressElement = this.elements.initModal.querySelector('.progress');
       errorsElement.innerText = errorString;
@@ -61,12 +70,6 @@ class CorpusAnalysisApp {
       return;
     }
 
-    // Initialize extensions
-    for (const extension of Object.values(this.extensions)) {
-      statusTextElement.innerHTML += `<br>Initializing ${extension.name} extension...`;
-      await extension.init();
-      statusTextElement.innerText += ' Done'
-    }
     for (const extensionSelectorElement of this.elements.extensionCards.querySelectorAll('.extension-selector')) {
       extensionSelectorElement.addEventListener('click', () => {
         this.elements.m.extensionTabs.select(extensionSelectorElement.dataset.target);
diff --git a/app/static/js/cqi/api/client.js b/app/static/js/cqi/api/client.js
index 82f8176f..14bf3690 100644
--- a/app/static/js/cqi/api/client.js
+++ b/app/static/js/cqi/api/client.js
@@ -30,7 +30,11 @@ cqi.api.APIClient = class APIClient {
     } else if (response.code === 500) {
       throw new Error(`[${response.code}] ${response.msg}`);
     } else if (response.code === 502) {
-      throw new cqi.errors.lookup[response.payload.code]();
+      if (response.payload.code in cqi.errors.lookup) {
+        throw new cqi.errors.lookup[response.payload.code]();
+      } else {
+        throw new cqi.errors.CQiError();
+      }
     }
   }
 
diff --git a/app/templates/corpora/analysis.html.j2 b/app/templates/corpora/analysis.html.j2
index 9d4c27aa..2938f886 100644
--- a/app/templates/corpora/analysis.html.j2
+++ b/app/templates/corpora/analysis.html.j2
@@ -48,8 +48,9 @@
 {{ super() }}
 <div class="modal no-autoinit" id="corpus-analysis-app-init-modal">
   <div class="modal-content">
-    <h4>Initializing session</h4>
+    <h4>We are preparing your analysis session</h4>
     <p>
+      Our server works as hard as it can to prepare your analysis session. Please be patient and give it some time.<br>
       If initialization takes longer than usual or an error occurs, <a onclick="window.location.reload()" href="#">reload the page</a>.
     </p>
     <div class="progress">