try:
     threadHolder.thread.join(timeout=30.0)  # 30 second timeout
-    
-    # Double-check that thread actually finished joining
-    if threadHolder.thread.is_alive():
-        # Thread didn't finish within timeout - this is a serious issue
-        raise Exception(f"Thread {threadID} failed to join within 30 seconds timeout. "
-                      f"Thread may be hung or in an inconsistent state.")
-        
 except Exception as join_exc:
     # Handle join-specific exceptions with more context
     raise Exception(f"Failed to join thread {threadID}: {join_exc}. "
                   f"This may indicate a system threading issue or hung test case.")
 
+# Double-check that thread actually finished joining
+if threadHolder.thread.is_alive():
+    # Thread didn't finish within timeout - this is a serious issue
+    raise Exception(f"Thread {threadID} failed to join within 30 seconds timeout. "
+                  f"Thread may be hung or in an inconsistent state.")
+

 try:
     if self._target:
         self._target(*self._args, **self._kwargs)
-        self.completed_successfully = True  # Mark as completed successfully
 except Exception as exc:
     self.exc = exc
     # Store the full traceback for better error reporting
     self.exc_info = traceback.format_exc()
+else:
+    # Only set completion flag if no exception occurred
+    self.completed_successfully = True

 if threadHolder.thread.exc is not None:
-    if threadHolder.thread.completed_successfully:
-        # Test framework handled the exception gracefully (e.g., test failure)
-        # Don't re-raise - this is expected behavior
-        pass
+    # Always propagate exceptions - if there's an exception, the thread didn't complete successfully
+    if hasattr(threadHolder.thread, 'exc_info') and threadHolder.thread.exc_info:
+        error_msg = f"Worker thread {threadID} failed with unhandled exception:\n{threadHolder.thread.exc_info}"
+        raise Exception(error_msg) from threadHolder.thread.exc
     else:
-        # Unhandled exception - this indicates a real problem
-        if hasattr(threadHolder.thread, 'exc_info') and threadHolder.thread.exc_info:
-            error_msg = f"Worker thread {threadID} failed with unhandled exception:\n{threadHolder.thread.exc_info}"
-            raise Exception(error_msg) from threadHolder.thread.exc
-        else:
-            raise threadHolder.thread.exc
+        raise threadHolder.thread.exc