diff --git a/decrypt.html b/decrypt.html
index 978d001..33938cd 100644
--- a/decrypt.html
+++ b/decrypt.html
@@ -32,8 +32,13 @@
     }
 
     openpgp.decrypt(options).then(plaintext => {
+      if (plaintext.data) {
         document.getElementById("result").value = plaintext.data;
         document.getElementById("progressbar").className = "progress-bar bg-success";
+      } else {
+        document.getElementById("result").value = 'Error decrypting message.';
+        document.getElementById("progressbar").className = "progress-bar bg-danger";
+      }
     })
   }
   </script>
diff --git a/encrypt.html b/encrypt.html
index 5b1efc3..d1ddde1 100644
--- a/encrypt.html
+++ b/encrypt.html
@@ -24,12 +24,15 @@
         publicKeys: (await openpgp.key.readArmored(pubkey)).keys, // for encryption
     }
 
-    console.log(options);
-
     openpgp.encrypt(options).then(ciphertext => {
         encrypted = ciphertext.data // '-----BEGIN PGP MESSAGE ... END PGP MESSAGE-----'
-        document.getElementById("result").value = encrypted;
-        document.getElementById("progressbar").className = "progress-bar bg-success";
+        if (encrypted) {
+          document.getElementById("result").value = encrypted;
+          document.getElementById("progressbar").className = "progress-bar bg-success";
+        } else {
+          document.getElementById("result").value = 'Encryption failed.';
+          document.getElementById("progressbar").className = "progress-bar bg-danger";
+        }
     })
   }
   </script>