3 files changed, 11 insertions, 13 deletions
diff --git a/app/scripts/controllers/address-book.js b/app/scripts/controllers/address-book.js
index c66eb2bd4..6fb4ee114 100644
--- a/app/scripts/controllers/address-book.js
+++ b/app/scripts/controllers/address-book.js
@@ -39,11 +39,11 @@ class AddressBookController {
   // pushed object is an object of two fields. Current behavior does not set an
   // upper limit to the number of addresses.
   _addToAddressBook (address, name) {
-    let addressBook = this._getAddressBook()
-    let identities = this._getIdentities()
+    const addressBook = this._getAddressBook()
+    const identities = this._getIdentities()
 
-    let addressBookIndex = addressBook.findIndex((element) => { return element.address.toLowerCase() === address.toLowerCase() || element.name === name })
-    let identitiesIndex = Object.keys(identities).findIndex((element) => { return element.toLowerCase() === address.toLowerCase() })
+    const addressBookIndex = addressBook.findIndex((element) => { return element.address.toLowerCase() === address.toLowerCase() || element.name === name })
+    const identitiesIndex = Object.keys(identities).findIndex((element) => { return element.toLowerCase() === address.toLowerCase() })
     // trigger this condition if we own this address--no need to overwrite.
     if (identitiesIndex !== -1) {
       return Promise.resolve(addressBook)
diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index c4904f8ac..fb130ed76 100644
--- a/app/scripts/controllers/currency.js
+++ b/app/scripts/controllers/currency.js
@@ -51,9 +51,11 @@ class CurrencyController {
       this.setConversionRate(Number(parsedResponse.ticker.price))
       this.setConversionDate(Number(parsedResponse.timestamp))
     }).catch((err) => {
-      console.warn('MetaMask - Failed to query currency conversion.')
-      this.setConversionRate(0)
-      this.setConversionDate('N/A')
+      if (err) {
+        console.warn('MetaMask - Failed to query currency conversion.')
+        this.setConversionRate(0)
+        this.setConversionDate('N/A')
+      }
     })
   }
 
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index c7f675a41..7212c7c43 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -36,8 +36,8 @@ class PreferencesController {
   }
 
   addToFrequentRpcList (_url) {
-    let rpcList = this.getFrequentRpcList()
-    let index = rpcList.findIndex((element) => { return element === _url })
+    const rpcList = this.getFrequentRpcList()
+    const index = rpcList.findIndex((element) => { return element === _url })
     if (index !== -1) {
       rpcList.splice(index, 1)
     }
@@ -53,13 +53,9 @@ class PreferencesController {
   getFrequentRpcList () {
     return this.store.getState().frequentRpcList
   }
-
   //
   // PRIVATE METHODS
   //
-
-
-
 }
 
 module.exports = PreferencesController