Merge pull request #86 from MetaMask/CallbackRestoreErrors

Call back with wallet restore errors

1 files changed, 5 insertions, 1 deletions

diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 1bc1ebcb2..13acd7a82 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -227,7 +227,11 @@ IdentityStore.prototype._createIdmgmt = function(password, seed, entropy, cb){
     var serializedKeystore = configManager.getWallet()
 
     if (seed) {
-      keyStore = this._restoreFromSeed(password, seed, derivedKey)
+      try {
+        keyStore = this._restoreFromSeed(password, seed, derivedKey)
+      } catch (e) {
+        return cb(e)
+      }
 
     // returning user, recovering from storage
     } else if (serializedKeystore) {