diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4e96ee44d..c35a6f6a0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-04  Christopher Faylor  <cgf@redhat.com>
+
+	* fhandler_process.cc (fhandler_process::fill_filebuf): Deal with error
+	condition from cmdline retrieval.
+
 2002-11-04  Christopher Faylor  <cgf@redhat.com>
 
 	* sigproc.cc (WAIT_SIG_PRIORITY): Bump to highest priority.
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc
index a9e8d2f0c..03000a21d 100644
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler_process.cc
@@ -301,7 +301,7 @@ fhandler_process::fill_filebuf ()
 	if (filebuf)
 	  free (filebuf);
 	filebuf = p->cmdline (filesize);
-	if (!*filebuf)
+	if (!filebuf || !*filebuf)
 	  filebuf = strdup ("<defunct>");
 	break;
       }