diff --git a/server/lib/bdrb_thread_pool.rb b/server/lib/bdrb_thread_pool.rb
index 374d6dd..ac63db2 100644
--- a/server/lib/bdrb_thread_pool.rb
+++ b/server/lib/bdrb_thread_pool.rb
@@ -63,7 +63,7 @@ def add_thread
             Thread.current[:persistent_job_id] = task.persistent_job_id
             block_result = run_task(task)
           rescue BackgrounDRb::InterruptedException
-            next
+            logger.info("BackgronDRb thread interrupted: #{Thread.current.inspect}")
           end
         end
       end
@@ -82,9 +82,9 @@ def run_task task
           result = master.send(task.job_method)
         end
         return result
-      rescue BackgrounDRb::InterruptedException
-        # Don't log, just return nil.
-        return nil
+      rescue BackgrounDRb::InterruptedException => e
+        # Don't log, just re-raise
+        raise e
       rescue
         logger.info($!.to_s)
         logger.info($!.backtrace.join("\n"))