diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 09c56ac2..44bcc310 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-13  Werner Koch  <wk@gnupg.org>
+
+	* verify.c (gpgme_op_verify): Make sure that we never access an
+	unitialized result structure.
+
 2002-06-12  Werner Koch  <wk@gnupg.org>
 
 	* keylist.c (struct keylist_result_s): New.
diff --git a/gpgme/verify.c b/gpgme/verify.c
index be2067cd..fe99aa97 100644
--- a/gpgme/verify.c
+++ b/gpgme/verify.c
@@ -461,7 +461,7 @@ gpgme_op_verify (GpgmeCtx ctx, GpgmeData sig, GpgmeData text,
   if (!err)
     {
       err = _gpgme_wait_one (ctx);
-      if (!err)
+      if (!err && ctx->result.verify)
 	*r_stat = _gpgme_intersect_stati (ctx->result.verify);
     }
     return err;