diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 6f27890b..9dce5958 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-23  Marcus Brinkmann  <marcus@g10code.de>
+
+	* keylist.c (gpgme_op_keylist_next): Return error if OPD is NULL.
+
 2006-09-25  Marcus Brinkmann  <marcus@g10code.de>
 
 	* data-mem.c (gpgme_data_release_and_get_mem): Release the data
diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 8e3fefe4..1c60da5c 100644
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -883,6 +883,8 @@ gpgme_op_keylist_next (gpgme_ctx_t ctx, gpgme_key_t *r_key)
   opd = hook;
   if (err)
     return err;
+  if (opd == NULL)
+    return gpg_error (GPG_ERR_INV_VALUE);
 
   if (!opd->key_queue)
     {