diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 57e653cfc9..faf2c43df6 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -6,6 +6,7 @@
 	(nonexisting_handle): New function.  Same as old invalid_handle.
 	* join.c (pthread_join): Use nonexisting_handle instead of
 	invalid_handle to test for acceptable thread handle.
+	* manager.c (pthread_handle_free): Likewise.
 	Reported by Permaine Cheung <pcheung@cygnus.com>.
 
 2000-06-08  Ulrich Drepper  <drepper@redhat.com>
diff --git a/linuxthreads/manager.c b/linuxthreads/manager.c
index 149cc938b9..0ca172c8dd 100644
--- a/linuxthreads/manager.c
+++ b/linuxthreads/manager.c
@@ -634,7 +634,7 @@ static void pthread_handle_free(pthread_t th_id)
   pthread_descr th;
 
   __pthread_lock(&handle->h_lock, NULL);
-  if (invalid_handle(handle, th_id)) {
+  if (nonexisting_handle(handle, th_id)) {
     /* pthread_reap_children has deallocated the thread already,
        nothing needs to be done */
     __pthread_unlock(&handle->h_lock);
diff --git a/linuxthreads/pthread.c b/linuxthreads/pthread.c
index 38bf197a62..1e650f4e46 100644
--- a/linuxthreads/pthread.c
+++ b/linuxthreads/pthread.c
@@ -513,7 +513,7 @@ int __pthread_create_2_1(pthread_t *thread, const pthread_attr_t *attr,
               &request.req_args.create.mask);
   __libc_write(__pthread_manager_request, (char *) &request, sizeof(request));
   suspend(self);
-  retval = THREAD_GETMEM(self, p_retcode;
+  retval = THREAD_GETMEM(self, p_retcode);
   if (retval == 0)
     *thread = (pthread_t) THREAD_GETMEM(self, p_retval);
   return retval;