diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 13cd50f4..ccfa4c42 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-09  Marcus Brinkmann  <marcus@g10code.de>
+
+	* engine-gpgsm.c (gpgsm_assuan_simple_command): Return 0 if we
+	reach the end of the function.
+
 2002-02-09  Marcus Brinkmann  <marcus@g10code.de>
 
 	* genkey.c (gpgme_op_genkey_start): Fix logic in validity check.
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 7852a1a6..3d2b3dbf 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -369,6 +369,7 @@ gpgsm_assuan_simple_command (ASSUAN_CONTEXT ctx, char *cmd)
 
   if (!err)
     err = mk_error (General_Error);
+  return 0;
 }