diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 1ed2d4e79..03440a1e9 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-21  Christopher Faylor  <cgf@redhat.com>
+
+	* cygtls.cc (handle_threadlist_exception): Change logic, improve
+	debugging output.
+
 2004-01-21  Christopher Faylor  <cgf@redhat.com>
 
 	* fhandler_tty.cc (fhandler_tty::ioctl): Semi-revert 2003-09-26 change
diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc
index ecec3f52b..6e31d66e6 100644
--- a/winsup/cygwin/cygtls.cc
+++ b/winsup/cygwin/cygtls.cc
@@ -200,13 +200,26 @@ extern "C" DWORD __stdcall RtlUnwind (void *, void *, void *, DWORD);
 static int
 handle_threadlist_exception (EXCEPTION_RECORD *e, void *frame, CONTEXT *, void *)
 {
-  small_printf ("in handle_threadlist_exception!\n");
   if (e->ExceptionCode != STATUS_ACCESS_VIOLATION)
-    return 1;
+    {
+      system_printf ("handle_threadlist_exception called with exception code %d\n",
+		     e->ExceptionCode);
+      return 1;
+    }
 
   sentry here;
-  if (threadlist_ix != BAD_IX || !here.acquired ())
-    return 1;
+  if (threadlist_ix == BAD_IX)
+    {
+      system_printf ("handle_threadlist_exception called with threadlist_ix %d\n",
+		     BAD_IX);
+      return 1;
+    }
+
+  if (!here.acquired ())
+    {
+      system_printf ("handle_threadlist_exception couldn't aquire muto\n");
+      return 1;
+    }
 
   extern void *threadlist_exception_return;
   cygheap->threadlist[threadlist_ix]->remove (INFINITE);