diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index ab66d81f..63be9462 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-22  Marcus Brinkmann  <marcus@g10code.de>
+
+	* keylist.c (keylist_colon_handler): Move debug output after
+	initialising KEY.
+
 2006-07-29  Marcus Brinkmann  <marcus@g10code.de>
 
 	* gpgme-config.in (Options): Add NETLIBS.
diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index b6190162..8e3fefe4 100644
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -386,9 +386,6 @@ keylist_colon_handler (void *priv, char *line)
   gpgme_subkey_t subkey = NULL;
   gpgme_key_sig_t keysig = NULL;
 
-  DEBUG3 ("keylist_colon_handler ctx = %p, key = %p, line = %s\n",
-	  ctx, key, line ? line : "(null)");
-
   err = _gpgme_op_data_lookup (ctx, OPDATA_KEYLIST, &hook, -1, NULL);
   opd = hook;
   if (err)
@@ -396,6 +393,9 @@ keylist_colon_handler (void *priv, char *line)
 
   key = opd->tmp_key;
 
+  DEBUG3 ("keylist_colon_handler ctx = %p, key = %p, line = %s\n",
+	  ctx, key, line ? line : "(null)");
+
   if (!line)
     {
       /* End Of File.  */