diff --git a/ChangeLog b/ChangeLog
index 3138fd00e5..2c6547f64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 25 20:14:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
+	  threads should be also processed.  [ruby-talk:121320]
+
 Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
diff --git a/lib/thwait.rb b/lib/thwait.rb
index 8549ca0884..95d294a85d 100644
--- a/lib/thwait.rb
+++ b/lib/thwait.rb
@@ -117,8 +117,11 @@ class ThreadsWait
     @threads.concat threads
     for th in threads
       Thread.start(th) do |t|
-	t.join
-	@wait_queue.push t
+	begin
+	  t.join
+	ensure
+	  @wait_queue.push t
+	end
       end
     end
   end