diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 935c6395..abd0dbbf 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-18  Marcus Brinkmann  <marcus@g10code.de>
+
+	* engine-gpgsm.c (_gpgme_gpgsm_op_sign): Call
+	gpgsm_assuan_simple_command with status handlers.
+	* edit.c (_gpgme_op_edit_start): Check return value of
+	_gpgme_engine_op_edit.
+	* import.c (_gpgme_op_import_start): Likewise for
+	_gpgme_engine_op_import.
+	* sign.c (_gpgme_op_sign_start): Likewise for
+	_gpgme_engine_op_sign.
+
 2003-01-30  Marcus Brinkmann  <marcus@g10code.de>
 
 	* edit.c (_gpgme_edit_status_handler): Call the progress status
diff --git a/gpgme/edit.c b/gpgme/edit.c
index afc0a355..19cbce6c 100644
--- a/gpgme/edit.c
+++ b/gpgme/edit.c
@@ -112,10 +112,11 @@ _gpgme_op_edit_start (GpgmeCtx ctx, int synchronous,
 
   _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
-  _gpgme_engine_op_edit (ctx->engine, key, out, ctx);
+  err = _gpgme_engine_op_edit (ctx->engine, key, out, ctx);
 
   /* And kick off the process.  */
-  err = _gpgme_engine_start (ctx->engine, ctx);
+  if (!err)
+    err = _gpgme_engine_start (ctx->engine, ctx);
   
  leave:
   if (err)
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 41e63f57..8e66ba84 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -1138,7 +1138,8 @@ _gpgme_gpgsm_op_sign (GpgsmObject gpgsm, GpgmeData in, GpgmeData out,
 
           strcpy (stpcpy (buf, "SIGNER "), s);
           err = gpgsm_assuan_simple_command (gpgsm->assuan_ctx, buf,
-                                             NULL, NULL);
+                                             gpgsm->status.fnc,
+					     gpgsm->status.fnc_value);
 	}
       else
         err = GPGME_Invalid_Key;
diff --git a/gpgme/import.c b/gpgme/import.c
index f522c957..55b69eac 100644
--- a/gpgme/import.c
+++ b/gpgme/import.c
@@ -196,7 +196,7 @@ _gpgme_op_import_start (GpgmeCtx ctx, int synchronous, GpgmeData keydata)
   _gpgme_engine_set_status_handler (ctx->engine, import_status_handler, ctx);
   _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
-  _gpgme_engine_op_import (ctx->engine, keydata);
+  err = _gpgme_engine_op_import (ctx->engine, keydata);
 
   if (!err)
     err = _gpgme_engine_start (ctx->engine, ctx);
diff --git a/gpgme/sign.c b/gpgme/sign.c
index c077c55e..9b9a6b21 100644
--- a/gpgme/sign.c
+++ b/gpgme/sign.c
@@ -206,12 +206,13 @@ _gpgme_op_sign_start (GpgmeCtx ctx, int synchronous,
 				    ctx);
   _gpgme_engine_set_verbosity (ctx->engine, ctx->verbosity);
 
-  _gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
-			 ctx->use_textmode, ctx->include_certs,
-			 ctx /* FIXME */);
+  err = _gpgme_engine_op_sign (ctx->engine, in, out, mode, ctx->use_armor,
+			       ctx->use_textmode, ctx->include_certs,
+			       ctx /* FIXME */);
 
   /* And kick off the process.  */
-  err = _gpgme_engine_start (ctx->engine, ctx);
+  if (!err)
+    err = _gpgme_engine_start (ctx->engine, ctx);
   
  leave:
   if (err)