1 files changed, 5 insertions, 2 deletions
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