diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index f3b78b5b..b773ef94 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-24  Marcus Brinkmann  <marcus@g10code.de>
+
+	* trustlist.c (gpgme_op_trustlist_next): Return error if OPD is
+	NULL.
+
 2006-10-23  Marcus Brinkmann  <marcus@g10code.de>
 
 	* wait-global.c (gpgme_wait): Unlock CTX_LIST_LOCK while calling
diff --git a/gpgme/trustlist.c b/gpgme/trustlist.c
index f33860a4..e8cdb66e 100644
--- a/gpgme/trustlist.c
+++ b/gpgme/trustlist.c
@@ -215,6 +215,8 @@ gpgme_op_trustlist_next (gpgme_ctx_t ctx, gpgme_trust_item_t *r_item)
   opd = hook;
   if (err)
     return err;
+  if (opd == NULL)
+    return gpg_error (GPG_ERR_INV_VALUE);
 
   if (!opd->trust_queue)
     {