Explicitly catch NoMethodError instead of catching with Object when there are no events in queue

lib/god/driver.rb

@@ -179,7 +179,7 @@ def initialize(task)
         loop do
           begin
             @events.pop.handle_event
-          rescue ThreadError => e
+          rescue ThreadError, NoMethodError => e
             # queue is empty
             break
           rescue Object => e
@@ -189,6 +189,7 @@ def initialize(task)
           end
         end
       end
+      @thread.abort_on_exception = true
     end
 
     # Check if we're in the driver context.

test/test_driver.rb

@@ -23,4 +23,12 @@ def test_push_pop_wait
 
     t.join
   end
+
+  def test_handle_empty_queue
+    task = God::Task.new
+    driver = God::Driver.new(task)
+
+    events = driver.instance_variable_get(:@events)
+    assert events.shutdown
+  end
 end