diff --git a/frontend/client/src/app.js b/frontend/client/src/app.js
index 804e204179..8620cd4fc6 100644
--- a/frontend/client/src/app.js
+++ b/frontend/client/src/app.js
@@ -431,7 +431,9 @@ _.extend(Espo.App.prototype, {
 				case 401:
 					if (!options.login) {
 						Espo.Ui.error(self.language.translate('Auth error'));
-						self.logout();
+						if (self.auth) {
+							self.logout();
+						}
 					}
 					break;
 				case 403:
diff --git a/frontend/client/src/layout-manager.js b/frontend/client/src/layout-manager.js
index 247ba972e5..95233c92af 100644
--- a/frontend/client/src/layout-manager.js
+++ b/frontend/client/src/layout-manager.js
@@ -80,9 +80,9 @@ _.extend(Espo.LayoutManager.prototype, {
 					this.cache.set('app-layout', key, layout);
 				}
 			}.bind(this),
-			error: function () {
-				throw new Error('Could not load layout ' + controller + '#' + type);
-			},
+			/*error: function () {
+				console.error('Could not load layout ' + controller + '#' + type);
+			},*/
 		});			
 	},		
 	
diff --git a/frontend/client/src/views/site/navbar.js b/frontend/client/src/views/site/navbar.js
index 8ffcb62ccb..6b01365552 100644
--- a/frontend/client/src/views/site/navbar.js
+++ b/frontend/client/src/views/site/navbar.js
@@ -70,7 +70,7 @@ Espo.define('Views.Site.Navbar', 'View', function (Dep) {
 		},
 
 		setup: function () {
-			this.getRouter().on('routed', function (e) {
+			this.getRouter().on('routed', function (e) {				
 				if (e.controller) {
 					this.selectTab(e.controller);
 				} else {