diff --git a/src/js/services/storageService.js b/src/js/services/storageService.js
index 5f78725a3..8b3b2618d 100644
--- a/src/js/services/storageService.js
+++ b/src/js/services/storageService.js
@@ -414,9 +414,9 @@ angular.module('copayApp.services')
     // }
     root.removeBitpayDebitCard = function(network, cardEid, cb) {
 
-      root.getBitpayAccounts(network, function(err, allAccounts){
+      root.getBitpayAccounts(network, function(err, allAccounts) {
 
-        lodash.each(allAccounts, function(account){
+        lodash.each(allAccounts, function(account) {
           account.cards = lodash.reject(account.cards, {
             'eid': cardEid
           });
@@ -450,7 +450,10 @@ angular.module('copayApp.services')
         var allAccounts = {};
         try {
           allAccounts = JSON.parse(allAccountsStr);
-        } catch (e) {};
+        } catch (e) {
+          $log.error('Bad storage value for bitpayAccount-v2' + allAccountsStr)
+          return cb(null, {});
+        };
 
         var anyMigration;
 
@@ -474,10 +477,10 @@ angular.module('copayApp.services')
         });
 
         if (anyMigration) {
-          storage.set('bitpayAccounts-v2-' + network, allAccounts, function(){
+          storage.set('bitpayAccounts-v2-' + network, allAccounts, function() {
             return cb(err, allAccounts);
           });
-        } else 
+        } else
           return cb(err, allAccounts);
 
       });