diff --git a/lib/cc/engine/analyzers/file_thread_pool.rb b/lib/cc/engine/analyzers/file_thread_pool.rb
index f369ab07..971df120 100644
--- a/lib/cc/engine/analyzers/file_thread_pool.rb
+++ b/lib/cc/engine/analyzers/file_thread_pool.rb
@@ -17,11 +17,8 @@ def run(&block)
 
           @workers = thread_count.times.map do
             Thread.new do
-              begin 
-                while item = queue.pop(true)
-                  yield item
-                end
-              rescue ThreadError
+              while !queue.empty? && (item = queue.pop(true))
+                yield item
               end
             end
           end