diff --git a/dev/Stores/User/GnuPG.js b/dev/Stores/User/GnuPG.js
index 4d4a2422e..b7e3ab696 100644
--- a/dev/Stores/User/GnuPG.js
+++ b/dev/Stores/User/GnuPG.js
@@ -97,6 +97,7 @@ export const GnuPGUserStore = new class {
 									}
 								} catch (e) {
 									Passphrases.delete(key);
+									alert(e.message);
 								}
 							}
 							return key.armor;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
index 24f2dda83..213043bc3 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
@@ -1114,9 +1114,9 @@ class PGP extends Base implements \SnappyMail\PGP\PGPInterface
 				foreach ($this->_openPipes->readPipeLines(self::FD_ERROR) as $line) {
 					$this->_debug("\t{$line}");
 					$errors[] = \preg_replace('/^gpg: /', '', $line);
-				}
-				if ($throw && $errors) {
-					break;
+					if ($throw && (\str_contains($line, 'error') || \str_contains($line, 'failed'))) {
+						break 2;
+					}
 				}
 			}