diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 4ed4104a9b1f..9ac972b76f9d 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -821,7 +821,11 @@ module.exports = class MetamaskController extends EventEmitter {
     this.accountTracker.removeAccount([address])
 
     // Remove account from the keyring
-    await this.keyringController.removeAccount(address)
+    try {
+      await this.keyringController.removeAccount(address)
+    } catch (e) {
+      log.error(e)
+    }
     return address
   }
 
diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js
index 44e267c5acbb..5f452d93c73e 100644
--- a/old-ui/app/components/account-dropdowns.js
+++ b/old-ui/app/components/account-dropdowns.js
@@ -27,6 +27,9 @@ class AccountDropdowns extends Component {
 
     return accountOrder.map((address, index) => {
       const identity = identities[address]
+      if (!identity) {
+        return null
+      }
       const isSelected = identity.address === selected
 
       const simpleAddress = identity.address.substring(2).toLowerCase()
diff --git a/old-ui/app/components/connect-hardware/index.js b/old-ui/app/components/connect-hardware/index.js
index e94e30f764f7..4875c7e1177e 100644
--- a/old-ui/app/components/connect-hardware/index.js
+++ b/old-ui/app/components/connect-hardware/index.js
@@ -125,7 +125,7 @@ class ConnectHardwareForm extends Component {
         if (e === 'Window blocked') {
           this.setState({ browserSupported: false, error: null})
         } else if (e !== 'Window closed') {
-          this.setState({ error: e.toString() })
+          this.setState({ error: (e.message || e.toString()) })
         }
       })
   }
@@ -140,7 +140,7 @@ class ConnectHardwareForm extends Component {
         unlocked: false,
       })
     }).catch(e => {
-      this.setState({ error: e.toString() })
+      this.setState({ error: (e.message || e.toString()) })
     })
   }
 
@@ -154,7 +154,7 @@ class ConnectHardwareForm extends Component {
     .then(_ => {
       this.props.goHome()
     }).catch(e => {
-      this.setState({ error: e.toString() })
+      this.setState({ error: (e.message || e.toString()) })
     })
   }