diff --git a/eden/mononoke/fastreplay/src/main.rs b/eden/mononoke/fastreplay/src/main.rs
index 6333deb8e3..c1818cbe97 100644
--- a/eden/mononoke/fastreplay/src/main.rs
+++ b/eden/mononoke/fastreplay/src/main.rs
@@ -334,7 +334,9 @@ async fn bootstrap_repositories<'a>(
 
             if let Some(warmup) = warmup {
                 info!(&logger, "Waiting for cache warmup to complete...");
-                warmup.await??;
+                warmup
+                    .await?
+                    .with_context(|| format!("Performing cache warmup on {}", name))?;
             }
 
             Result::<_, Error>::Ok((name, dispatcher))