diff --git a/jnlib/ChangeLog b/jnlib/ChangeLog
index 1527fb773..e9f643774 100644
--- a/jnlib/ChangeLog
+++ b/jnlib/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-05  Werner Koch  <wk@gnupg.org>
+
+	* logging.c (log_set_file): Oops, don't close if LOGSTREAM is NULL.
+
 2004-04-30  Werner Koch  <wk@gnupg.org>
 
 	* logging.c (log_set_file): Make sure the log stream will be
diff --git a/jnlib/logging.c b/jnlib/logging.c
index 7397ddd30..c75efaf85 100644
--- a/jnlib/logging.c
+++ b/jnlib/logging.c
@@ -260,7 +260,7 @@ log_set_file (const char *name)
       force_prefixes = 1;
       /* On success close the old logstream right now, so that we are
          really sure it has been closed. */
-      if (fp)
+      if (fp && logstream)
         {
           fclose (logstream);
           logstream = NULL;