diff --git a/overviewer_core/dispatcher.py b/overviewer_core/dispatcher.py
index f037131..44680bb 100644
--- a/overviewer_core/dispatcher.py
+++ b/overviewer_core/dispatcher.py
@@ -307,22 +307,21 @@ class MultiprocessingDispatcher(Dispatcher):
         self.outstanding_jobs += 1
         
         # make sure the queue doesn't fill up too much
-        finished_jobs = self._handle_messages()
+        finished_jobs = self._handle_messages(timeout=0.0)
         while self.outstanding_jobs > self.num_workers * 10:
             finished_jobs += self._handle_messages()
         return finished_jobs
     
     def finish_work(self):
         # empty the queue
-        self._handle_messages()
+        self._handle_messages(timeout=0.0)
         while self.outstanding_jobs > 0:
             self._handle_messages()
     
-    def _handle_messages(self):
+    def _handle_messages(self, timeout=1.0):
         # work function: takes results out of the result queue and
         # keeps track of how many outstanding jobs remain
         finished_jobs = []
-        timeout = 1.0
         
         result_empty = False
         signal_empty = False
@@ -343,7 +342,10 @@ class MultiprocessingDispatcher(Dispatcher):
                     result_empty = True
             if not signal_empty:
                 try:
-                    name, args, kwargs = self.signal_queue.get(True, timeout)
+                    if timeout > 0.0:
+                        name, args, kwargs = self.signal_queue.get(True, timeout)
+                    else:
+                        name, args, kwargs = self.signal_queue.get(False)
                     # timeout should only apply once
                     timeout = 0.0