diff --git a/src/encrypt.c b/src/encrypt.c
index 8672cd36..307c862b 100644
--- a/src/encrypt.c
+++ b/src/encrypt.c
@@ -184,8 +184,13 @@ encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args)
 static gpgme_error_t
 encrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_encrypt_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_encrypt_status_handler (priv, code, args);
+
+  return err;
 }