diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 364f8c398..99a6e5483 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22  Christopher Faylor  <cgf@timesys.com>
+
+	* cygthread.cc (cygthread::stub): Make diagnostic output more informative.
+
 2004-12-22  Christopher Faylor  <cgf@timesys.com>
 
 	* pinfo.cc (proc_waiter): Zero wait_thread in child to avoid races with
diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
index 80fc5e0cc..55f745a8b 100644
--- a/winsup/cygwin/cygthread.cc
+++ b/winsup/cygwin/cygthread.cc
@@ -54,8 +54,9 @@ cygthread::stub (VOID *arg)
 
   while (1)
     {
-      if (!info->__name)
-	system_printf ("erroneous thread activation");
+      const char *name = info->__name;
+      if (!name)
+	system_printf ("erroneous thread activation, name is non-NULL '%s'", name);
       else
 	{
 	  if (!info->func || exiting)