diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 1786f7c24..4e9193ab2 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -721,6 +721,10 @@ module.exports = class KeyringController extends EventEmitter {
   // initializing the persisted keyrings to RAM.
   unlockKeyrings (password) {
     const encryptedVault = this.configManager.getVault()
+    if (!encryptedVault) {
+      throw new Error('Cannot unlock without a previous vault.')
+    }
+
     return this.encryptor.decrypt(password, encryptedVault)
     .then((vault) => {
       this.password = password