From fb88b05463f7bb6fe5919bd0425f2bd66568c6ce Mon Sep 17 00:00:00 2001
From: Brendon Duncan <brendon@bitcoin.com>
Date: Thu, 28 Jun 2018 21:55:06 +1200
Subject: [PATCH] Catching exception caused by using the wrong key to decrypt
 the profile.

---
 src/js/services/encryptionService.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/js/services/encryptionService.js b/src/js/services/encryptionService.js
index f87a1f4f3..37b1b2c3b 100644
--- a/src/js/services/encryptionService.js
+++ b/src/js/services/encryptionService.js
@@ -124,7 +124,15 @@
           return;
         }
 
-        var decrypted = _decryptUsingCryptoJS(str, key, opts.iv);
+        var decrypted;
+        try {
+          decrypted = _decryptUsingCryptoJS(str, key, opts.iv);
+        } catch (e) {
+          // Can get this when using the wrong key: Malformed UTF-8 data
+          $log.error('Error when decrypting.', e);
+          cb(e, null);
+          return;
+        }
         cb(null, decrypted);
       });
     };