diff --git a/decrypt.html b/decrypt.html
index 8de1f4b..2bdcc0d 100644
--- a/decrypt.html
+++ b/decrypt.html
@@ -21,14 +21,14 @@
     const passphrase = document.getElementById("pass").value
     const encrypted = document.getElementById("pgpMsg").value
 
-    const privKeyObj = (await openpgp.key.readArmored(privkey)).keys[0]
+    const privKeyObj = (await openpgp.key.readArmored(privkey).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";})).keys[0]
 
     if (passphrase) {
-      await privKeyObj.decrypt(passphrase)
+      await privKeyObj.decrypt(passphrase).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";})
     }
 
     const options = {
-        message: await openpgp.message.readArmored(encrypted),    // parse armored message
+        message: await openpgp.message.readArmored(encrypted).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";}),    // parse armored message
         privateKeys: [privKeyObj]                                 // for decryption
     }
 
diff --git a/encrypt.html b/encrypt.html
index b5878dd..ca55b26 100644
--- a/encrypt.html
+++ b/encrypt.html
@@ -19,15 +19,9 @@
     // put keys in backtick (``) to avoid errors caused by spaces or tabs
     const pubkey = document.getElementById("pubKey").value
 
-    let options;
-    try {
-      options = {
-        message: openpgp.message.fromText(document.getElementById("text").value),       // input as Message object
-        publicKeys: (await openpgp.key.readArmored(pubkey)).keys, // for encryption
-      }
-    } catch (err) {
-      document.getElementById("result").value = err.message;
-      document.getElementById("progressbar").className = "progress-bar bg-danger";
+    const options = {
+      message: openpgp.message.fromText(document.getElementById("text").value).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";}),       // input as Message object
+      publicKeys: (await openpgp.key.readArmored(pubkey).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";})).keys, // for encryption
     }
 
     openpgp.encrypt(options).then(ciphertext => {
diff --git a/gen.html b/gen.html
index c0b7428..1d34b45 100644
--- a/gen.html
+++ b/gen.html
@@ -17,7 +17,7 @@
   const encryptDecryptFunction = async() => {
     document.getElementById("progressbar").className = "progress-bar progress-bar-striped progress-bar-animated";
 
-    var options = {
+    const options = {
       userIds: [{ name:document.getElementById("name").value, email:document.getElementById("email").value }], // multiple user IDs
       numBits: 4096,                                            // RSA key size
       passphrase: document.getElementById("pass").value         // protects the private key
diff --git a/sign.html b/sign.html
index 035cc08..26c3c4c 100644
--- a/sign.html
+++ b/sign.html
@@ -22,22 +22,17 @@
     const passphrase = document.getElementById("pass").value
     const msg = document.getElementById("msg").value
 
-    let privKeyObj;
-    let options;
-    try {
-      privKeyObj = (await openpgp.key.readArmored(privkey)).keys[0]
-      if (passphrase) {
-        await privKeyObj.decrypt(passphrase)
-      }
-      options = {
-        message: openpgp.cleartext.fromText(msg), // CleartextMessage or Message object
-        privateKeys: [privKeyObj]                             // for signing
-      };
-    } catch (err) {
-      document.getElementById("result").value = err.message;
-      document.getElementById("progressbar").className = "progress-bar bg-danger";
+    const privKeyObj = (await openpgp.key.readArmored(privkey).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";})).keys[0]
+
+    if (passphrase) {
+      await privKeyObj.decrypt(passphrase).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";})
     }
 
+    const options = {
+      message: openpgp.cleartext.fromText(msg).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";}), // CleartextMessage or Message object
+      privateKeys: [privKeyObj]                             // for signing
+    };
+
     openpgp.sign(options).then(function(signed) {
       cleartext = signed.data; // '-----BEGIN PGP SIGNED MESSAGE ... END PGP SIGNATURE-----'
       document.getElementById("result").value = cleartext;
diff --git a/verify.html b/verify.html
index 5f4535b..23557da 100644
--- a/verify.html
+++ b/verify.html
@@ -20,7 +20,7 @@
     const pubkey = document.getElementById("pubKey").value
     const cleartext = document.getElementById("signMsg").value
 
-    options = {
+    const options = {
       message: await openpgp.cleartext.readArmored(cleartext).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";}), // parse armored message
       publicKeys: (await openpgp.key.readArmored(pubkey).catch((err) => {document.getElementById("result").value = err.message;document.getElementById("progressbar").className = "progress-bar bg-danger";})).keys // for verification
     }