diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 3f10f0d8..6e53a723 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,13 @@
 2003-07-29  Marcus Brinkmann  <marcus@g10code.de>
 
+	* decrypt-verify.c (decrypt_verify_status_handler): Expand silly
+	and wrong expression.
+	* encrypt-sign.c (encrypt_sign_status_handler): Likewise.
+	* encrypt.c (encrypt_sym_status_handler): Likewise.
+	* sign.c (sign_status_handler): Likewise.
+	* verify.c (verify_status_handler): Likewise.
+	* decrypt.c (decrypt_status_handler): Likewise.
+
 	* engine.c (gpgme_get_engine_info): Initialize NULL.
 
 2003-07-23  Marcus Brinkmann  <marcus@g10code.de>
diff --git a/gpgme/decrypt-verify.c b/gpgme/decrypt-verify.c
index 916cda68..40818bfb 100644
--- a/gpgme/decrypt-verify.c
+++ b/gpgme/decrypt-verify.c
@@ -30,9 +30,14 @@ static gpgme_error_t
 decrypt_verify_status_handler (void *priv, gpgme_status_code_t code,
 			       char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_decrypt_status_handler (priv, code, args)
-    || _gpgme_verify_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_decrypt_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_verify_status_handler (priv, code, args);
+  return err;
 }
 
 
diff --git a/gpgme/decrypt.c b/gpgme/decrypt.c
index e503b266..030073fa 100644
--- a/gpgme/decrypt.c
+++ b/gpgme/decrypt.c
@@ -147,8 +147,12 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code,
 static gpgme_error_t
 decrypt_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_decrypt_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_decrypt_status_handler (priv, code, args);
+  return err;
 }
 
 
diff --git a/gpgme/encrypt-sign.c b/gpgme/encrypt-sign.c
index 8afb1f16..ae4b594a 100644
--- a/gpgme/encrypt-sign.c
+++ b/gpgme/encrypt-sign.c
@@ -30,9 +30,14 @@
 static gpgme_error_t
 encrypt_sign_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_sign_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);
+  if (!err)
+    err = _gpgme_sign_status_handler (priv, code, args);
+  return err;
 }
 
 
diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c
index 61619ed9..6eb177e0 100644
--- a/gpgme/encrypt.c
+++ b/gpgme/encrypt.c
@@ -117,8 +117,12 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code,
 static gpgme_error_t
 encrypt_sym_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_passphrase_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_passphrase_status_handler (priv, code, args);
+  return err;
 }
 
 
diff --git a/gpgme/sign.c b/gpgme/sign.c
index af007890..0f2c4ee3 100644
--- a/gpgme/sign.c
+++ b/gpgme/sign.c
@@ -236,8 +236,12 @@ _gpgme_sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
 static gpgme_error_t
 sign_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_sign_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_sign_status_handler (priv, code, args);
+  return err;
 }
 
 
diff --git a/gpgme/verify.c b/gpgme/verify.c
index 105d1c41..43190f64 100644
--- a/gpgme/verify.c
+++ b/gpgme/verify.c
@@ -532,8 +532,12 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
 static gpgme_error_t
 verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
 {
-  return _gpgme_progress_status_handler (priv, code, args)
-    || _gpgme_verify_status_handler (priv, code, args);
+  gpgme_error_t err;
+
+  err = _gpgme_progress_status_handler (priv, code, args);
+  if (!err)
+    err = _gpgme_verify_status_handler (priv, code, args);
+  return err;
 }