diff --git a/ui/app/pages/create-account/connect-hardware/index.js b/ui/app/pages/create-account/connect-hardware/index.js
index 8e80d3775..a17806207 100644
--- a/ui/app/pages/create-account/connect-hardware/index.js
+++ b/ui/app/pages/create-account/connect-hardware/index.js
@@ -129,7 +129,7 @@ class ConnectHardwareForm extends Component {
         }
       })
       .catch((e) => {
-        const errorMessage = e.message
+        const errorMessage = typeof e === 'string' ? e : e.message
         if (errorMessage === 'Window blocked') {
           this.setState({ browserSupported: false, error: null })
         } else if (errorMessage.includes(U2F_ERROR)) {
@@ -210,6 +210,7 @@ class ConnectHardwareForm extends Component {
             // eslint-disable-next-line react/jsx-key
             <a
               href="https://metamask.zendesk.com/hc/en-us/articles/360020394612-How-to-connect-a-Trezor-or-Ledger-Hardware-Wallet"
+              key="hardware-connection-guide"
               target="_blank"
               rel="noopener noreferrer"
               className="hw-connect__link"