diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f650542dbf..2c5c338231 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-21  Ulrich Drepper  <drepper@redhat.com>
+
+	* pthread_join.c (pthread_join): Limited checking for invalid
+	descriptors.
+	* pthread_timedjoin.c (pthread_timedjoin_np): Likewise.
+
 2003-02-20  Ulrich Drepper  <drepper@redhat.com>
 
 	* pthread_create.c (deallocate_tsd): Reset found_nonzero at the
diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c
index dd51fea4aa..0883f94f60 100644
--- a/nptl/pthread_timedjoin.c
+++ b/nptl/pthread_timedjoin.c
@@ -42,7 +42,7 @@ pthread_timedjoin_np (threadid, thread_return, abstime)
   int result;
 
   /* Make sure the descriptor is valid.  */
-  if (DEBUGGING_P && __find_in_stack_list (pd) == NULL)
+  if ((DEBUGGING_P && __find_in_stack_list (pd) == NULL) || pd->tid <= 0)
     /* Not a valid thread handle.  */
     return ESRCH;