diff --git a/src/main.rs b/src/main.rs
index 51847dcb..12ec5126 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -172,13 +172,16 @@ fn main() -> MainExit {
     let done = start.elapsed();
     debug!("run time: {done:?}");
 
-    result.map_or_else(MainExit::JoinErr, |res| {
-        res.map(|_| MainExit::Success(done)).unwrap_or_else(|err| {
-            err.downcast::<BinstallError>()
-                .map(MainExit::Error)
-                .unwrap_or_else(MainExit::Report)
-        })
-    })
+    result.map_or_else(
+        |join_err| MainExit::Error(BinstallError::from(join_err)),
+        |res| {
+            res.map(|_| MainExit::Success(done)).unwrap_or_else(|err| {
+                err.downcast::<BinstallError>()
+                    .map(MainExit::Error)
+                    .unwrap_or_else(MainExit::Report)
+            })
+        },
+    )
 }
 
 async fn entry(jobserver_client: LazyJobserverClient) -> Result<()> {