diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index fbcc9cd6..1f3cbed8 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-02  Marcus Brinkmann  <marcus@g10code.de>
+
+	* debug.c (_gpgme_debug_add): Test *LINE, not LINE.
+	(_gpgme_debug_end): Likewise.
+	Reported by Dr. Stefan Dalibor <Dr.Stefan.Dalibor@bfa.de>.
+
 2002-09-02  Marcus Brinkmann  <marcus@g10code.de>
 
 	* posix-io.c (_gpgme_io_select): Don't use a non-constant struct
diff --git a/gpgme/debug.c b/gpgme/debug.c
index 06ab1bc8..e0c7d89e 100644
--- a/gpgme/debug.c
+++ b/gpgme/debug.c
@@ -180,7 +180,7 @@ _gpgme_debug_add (void **line, const char *format, ...)
   char *toadd;
   char *result;
 
-  if (!line)
+  if (!*line)
     return;
 
   va_start (arg_ptr, format);
@@ -198,7 +198,7 @@ _gpgme_debug_add (void **line, const char *format, ...)
 void
 _gpgme_debug_end (void **line)
 {
-  if (!line)
+  if (!*line)
     return;
 
   /* The smallest possible level is 1, so force logging here by