diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 2767d262f20..e286369bbac 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -206,14 +206,13 @@ export default class AutofillService {
             return;
         }
 
-        const cipher = await this.cipherService.getLastUsedForDomain(tabDomain);
-        if (!cipher) {
+        const lastUsedCipher = await this.cipherService.getLastUsedForDomain(tabDomain);
+        if (!lastUsedCipher) {
             return;
         }
 
         await this.doAutoFill({
-            // tslint:disable-next-line
-            cipher: cipher,
+            cipher: lastUsedCipher,
             // tslint:disable-next-line
             pageDetails: pageDetails,
             fromBackground: true,
diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
index 69650cf1136..7b0d5d08b2f 100644
--- a/src/services/cipher.service.ts
+++ b/src/services/cipher.service.ts
@@ -235,7 +235,7 @@ export default class CipherService {
     async getLastUsedForDomain(domain: string): Promise<any> {
         const ciphers = await this.getAllDecryptedForDomain(domain);
         if (ciphers.length === 0) {
-            throw new Error('No ciphers.');
+            return null;
         }
 
         const sortedCiphers = ciphers.sort(CipherService.sortCiphersByLastUsed);