diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 55ca96ad4..242028c92 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -343,7 +343,7 @@ module.exports = class MetamaskController extends EventEmitter {
     updatePublicConfigStore(this.getState())
 
     publicConfigStore.destroy = () => {
-      this.removeEventListener('update', updatePublicConfigStore)
+      this.removeEventListener && this.removeEventListener('update', updatePublicConfigStore)
     }
 
     function updatePublicConfigStore (memState) {
diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
index f1428ba92..f2e321991 100644
--- a/ui/lib/account-link.js
+++ b/ui/lib/account-link.js
@@ -1,5 +1,5 @@
 module.exports = function (address, network, rpcPrefs) {
-  if (rpcPrefs.blockExplorerUrl) {
+  if (rpcPrefs && rpcPrefs.blockExplorerUrl) {
     return `${rpcPrefs.blockExplorerUrl}/address/${address}`
   }