diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index b1587182..71efca61 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,8 @@
 2006-11-29  Marcus Brinkmann  <marcus@g10code.de>
 
+	* engine-gpgsm.c (gpgsm_new): Check return value of
+	assuan_pipe_connect.
+
 	* rungpg.c: Include <unistd.h>.
 	(gpg_new): Support --display, --ttyname, --ttytype, --lc-ctype and
 	--lc-messages.  Fixes issue 734.
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 44dbd1f0..82b3fa86 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -406,7 +406,8 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir,
   err = assuan_pipe_connect (&gpgsm->assuan_ctx,
 			     file_name ? file_name : _gpgme_get_gpgsm_path (),
 			     argv, child_fds);
-  /* FIXME: Check error.  */
+  if (err)
+    goto leave;
 
   /* We need to know the fd used by assuan for reads.  We do this by
      using the assumption that the first returned fd from
diff --git a/gpgme/gpgme.h b/gpgme/gpgme.h
index ac662429..6251a2f7 100644
--- a/gpgme/gpgme.h
+++ b/gpgme/gpgme.h
@@ -72,7 +72,7 @@ extern "C" {
    AM_PATH_GPGME macro) check that this header matches the installed
    library.  Warning: Do not edit the next line.  configure will do
    that for you!  */
-#define GPGME_VERSION "1.1.3-cvs1179"
+#define GPGME_VERSION "1.1.3-cvs1188"