diff --git a/bigbluebutton-html5/client/main.jsx b/bigbluebutton-html5/client/main.jsx
index 050825854c304f1c1a7199edd634179895ef4e7d..bbcfaa44921b690400c9d2c989d55f4d7429cdd1 100755
--- a/bigbluebutton-html5/client/main.jsx
+++ b/bigbluebutton-html5/client/main.jsx
@@ -1,12 +1,12 @@
 /* eslint no-unused-vars: 0 */
 import React from 'react';
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
 import { render } from 'react-dom';
 import logger from '/imports/startup/client/logger';
-import LoadingScreen from '/imports/ui/components/loading-screen/component';
 import { joinRouteHandler, authenticatedRouteHandler } from '/imports/startup/client/auth';
 import Base from '/imports/startup/client/base';
-import { Session } from 'meteor/session';
+import LoadingScreen from '/imports/ui/components/loading-screen/component';
 
 Meteor.startup(() => {
   render(<LoadingScreen />, document.getElementById('app'));
@@ -17,13 +17,22 @@ Meteor.startup(() => {
     let message = e.error.toString();
 
     // Checks if stack includes the message, if not add the two together.
-    (stack.includes(message)) ? message = stack : message += `\n${stack}`;
+    if (stack.includes(message)) {
+      message = stack;
+    } else {
+      message += `\n${stack}`;
+    }
     logger.error(message);
   });
 
   // TODO make this a Promise
   joinRouteHandler((value, error) => {
-    authenticatedRouteHandler((valueInner, errorInner) => {
+    if (error) {
+      logger.error(`User faced [${value}] on main.joinRouteHandler. Error was:`, JSON.stringify(error));
+    } else {
+      logger.info(`User successfully went through main.joinRouteHandler with [${value}].`);
+    }
+    authenticatedRouteHandler(() => {
       // set defaults
       Session.set('isChatOpen', false);
       Session.set('idChatOpen', '');
diff --git a/bigbluebutton-html5/imports/startup/client/auth.js b/bigbluebutton-html5/imports/startup/client/auth.js
index ddb61c40f79e5348a86f9ed7327cdec6a0617265..6f50e762c62d406821a8d7f65d603220c1b58bef 100755
--- a/bigbluebutton-html5/imports/startup/client/auth.js
+++ b/bigbluebutton-html5/imports/startup/client/auth.js
@@ -19,7 +19,7 @@ export function joinRouteHandler(callback) {
 
   if (!sessionToken) {
     setError('404');
-    callback('failed - no sessionToken');
+    callback('failed - no sessionToken', urlParams);
   }
 
   // Old credentials stored in memory were being used when joining a new meeting
@@ -38,7 +38,7 @@ export function joinRouteHandler(callback) {
 
       if (returncode === 'FAILED') {
         setError('404');
-        callback('failed unhappily');
+        callback('failed during enter API call', response);
       } else {
         setCustomLogoUrl(customLogoURL);
 
@@ -69,7 +69,7 @@ export function joinRouteHandler(callback) {
 
         logger.info(clientInfo);
 
-        callback('all is cool'); // TODO 4767
+        callback('all is good', null);
       }
     });
 }