diff --git a/gpgmeplug/ChangeLog b/gpgmeplug/ChangeLog
index b2e25402..dd359c39 100644
--- a/gpgmeplug/ChangeLog
+++ b/gpgmeplug/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-20  Werner Koch  <wk@gnupg.org>
+
+	* gpgmeplug.c (nextCertificate): Sanity check for empty tmp_dn.
+
 2002-08-20  Steffen Hansen  <steffen@hrhansen.dk>
 
 	* Use gpgme_op_import_ext() instead of gpgme_op_import(). We
diff --git a/gpgmeplug/gpgmeplug.c b/gpgmeplug/gpgmeplug.c
index 4dab9ef8..6e17c554 100644
--- a/gpgmeplug/gpgmeplug.c
+++ b/gpgmeplug/gpgmeplug.c
@@ -2173,7 +2173,7 @@ nextCertificate( struct CertIterator* it, struct CertificateInfo** result )
       issuer_dn = tmp_dn = parse_dn( s );     
       /*it->info.issuer = xstrdup(s);*/
       it->info.issuer = reorder_dn( issuer_dn );
-      while( tmp_dn->key ) {
+      while( tmp_dn && tmp_dn->key ) {
 	free( tmp_dn->key );
 	free( tmp_dn->value );
 	++tmp_dn;