diff --git a/src/App.tsx b/src/App.tsx
index 9d06602..7b0bb22 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -17,6 +17,7 @@ import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
 import './App.css';
 
 import withSpin from './widgets/withSpin';
+import ErrorBoundary from './components/ErrorBoundary';
 import SideMenu from './SideMenu';
 import LoginGate from './LoginGate';
 import { RouteResolver } from './routes';
@@ -192,7 +193,9 @@ class App extends React.PureComponent {
             <SideMenu etesync={credentials} onCloseDrawerRequest={this.closeDrawer} />
           </Drawer>
 
-          <LoginGate credentials={this.props.credentials} />
+          <ErrorBoundary>
+            <LoginGate credentials={this.props.credentials} />
+          </ErrorBoundary>
         </div>
         </BrowserRouter>
       </MuiThemeProvider>
diff --git a/src/SideMenu/index.tsx b/src/SideMenu/index.tsx
index ce23c7f..1970b71 100644
--- a/src/SideMenu/index.tsx
+++ b/src/SideMenu/index.tsx
@@ -13,6 +13,7 @@ const logo = require('../images/logo.svg');
 import { History } from 'history';
 
 import SideMenuJournals from './SideMenuJournals';
+import ErrorBoundary from '../components/ErrorBoundary';
 
 import { routeResolver, getPalette } from '../App';
 
@@ -61,11 +62,13 @@ class SideMenu extends React.PureComponent {
         <React.Fragment>
           <ListDivider />
           <ListSubheader>Journals</ListSubheader>
-          <SideMenuJournals
-            etesync={this.props.etesync}
-            journals={this.props.journals.value}
-            onItemClick={this.journalClicked}
-          />
+          <ErrorBoundary>
+            <SideMenuJournals
+              etesync={this.props.etesync}
+              journals={this.props.journals.value}
+              onItemClick={this.journalClicked}
+            />
+          </ErrorBoundary>
         </React.Fragment>
       );