Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints

1 files changed, 3 insertions, 1 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 021ffcdfd..2d238b2f8 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -316,6 +316,7 @@ function tryUnlockMetamask (password) {
           background.verifySeedPhrase(err => {
             if (err) {
               dispatch(actions.displayWarning(err.message))
+              return reject(err)
             }
 
             resolve()
@@ -329,6 +330,7 @@ function tryUnlockMetamask (password) {
       .catch(err => {
         dispatch(actions.unlockFailed(err.message))
         dispatch(actions.hideLoadingIndication())
+        return Promise.reject(err)
       })
   }
 }
@@ -534,7 +536,7 @@ function importNewAccount (strategy, args) {
     } catch (err) {
       dispatch(actions.hideLoadingIndication())
       dispatch(actions.displayWarning(err.message))
-      return
+      throw err
     }
     dispatch(actions.hideLoadingIndication())
     dispatch(actions.updateMetamaskState(newState))