From d5766485ecde06237824b708ac7b71e10557336b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Thu, 8 Sep 2016 16:19:45 -0300
Subject: [PATCH] handle get keys exception

---
 src/js/controllers/backup.js     |  1 +
 src/js/services/walletService.js | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index ce0cba754..15d4e2168 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -25,6 +25,7 @@ angular.module('copayApp.controllers').controller('backupController',
 
       walletService.getKeys(wallet, function(err, k) {
         if (err || !k) {
+          $log.error('Could not get keys: ', err);
           $state.go('wallet.preferences');
           return;
         }
diff --git a/src/js/services/walletService.js b/src/js/services/walletService.js
index f5bf2e45d..c86246b51 100644
--- a/src/js/services/walletService.js
+++ b/src/js/services/walletService.js
@@ -861,7 +861,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
     askPassword(wallet.name, gettext('Enter Spending Password'), function(password) {
       if (!password) return cb('no password');
       if (!wallet.checkPassword(password)) return cb('wrong password');
-      
+
 
       return cb(null, password);
     });
@@ -956,8 +956,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
 
               $rootScope.$emit('Local/TxAction', wallet.id);
               var type = root.getViewStatus(wallet, broadcastedTxp);
-              root.openStatusModal(type, broadcastedTxp, function() {
-              });
+              root.openStatusModal(type, broadcastedTxp, function() {});
 
               return cb(null, broadcastedTxp)
             });
@@ -965,8 +964,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
             $rootScope.$emit('Local/TxAction', wallet.id);
 
             var type = root.getViewStatus(wallet, signedTxp);
-            root.openStatusModal(type, signedTxp, function() {
-            });
+            root.openStatusModal(type, signedTxp, function() {});
             return cb(null, signedTxp);
           }
         });
@@ -1032,7 +1030,7 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
       try {
         keys = wallet.getKeys(password);
       } catch (e) {
-        return cb(err);
+        return cb(e);
       }
 
       return cb(null, keys);