diff --git a/src/calibre/srv/tests/loop.py b/src/calibre/srv/tests/loop.py
index 6837662b2e..b88f1a8752 100644
--- a/src/calibre/srv/tests/loop.py
+++ b/src/calibre/srv/tests/loop.py
@@ -283,6 +283,7 @@ class LoopTest(BaseTest):
         status, result, tb, was_aborted = jm.job_status(job_id)
         self.assertEqual(status, 'finished')
         self.assertFalse(was_aborted)
-        self.assertTrue(tb), self.assertIn('a testing error', tb)
+        self.assertTrue(tb)
+        self.assertIn('a testing error', tb)
         jm.start_job('simple test', 'calibre.srv.jobs', 'sleep_test', args=(1.0,))
         jm.shutdown(), jm.wait_for_shutdown(monotonic() + 1)
diff --git a/src/calibre/utils/ipc/simple_worker.py b/src/calibre/utils/ipc/simple_worker.py
index 8408905c12..a54213d0d4 100644
--- a/src/calibre/utils/ipc/simple_worker.py
+++ b/src/calibre/utils/ipc/simple_worker.py
@@ -38,13 +38,11 @@ class ConnectedWorker(Thread):
         self.res = None
 
     def run(self):
-        conn = tb = None
+        conn = None
         try:
             conn = eintr_retry_call(self.listener.accept)
-        except:
-            tb = traceback.format_exc()
-        if conn is None:
-            self.tb = tb
+        except BaseException:
+            self.tb = traceback.format_exc()
             return
         self.accepted = True
         with closing(conn):
@@ -324,4 +322,3 @@ def offload():
                 res['tb'] = traceback.format_exc()
 
             eintr_retry_call(conn.send, res)
-