diff --git a/crates/wac-resolver/src/registry.rs b/crates/wac-resolver/src/registry.rs
index 8169497..53a5eec 100644
--- a/crates/wac-resolver/src/registry.rs
+++ b/crates/wac-resolver/src/registry.rs
@@ -153,7 +153,9 @@ impl RegistryPackageResolver {
         let mut finished = 0;
 
         while let Some(res) = tasks.next().await {
-            let (index, download) = res.unwrap()?;
+            let (index, download) = res.map_err(|e| Error::RegistryDownloadFailure {
+                source: anyhow::anyhow!("download task panicked: {e}"),
+            })??;
 
             finished += 1;