diff --git a/src/backfill/mod.rs b/src/backfill/mod.rs
index ba8d7dd..f97c8c9 100644
--- a/src/backfill/mod.rs
+++ b/src/backfill/mod.rs
@@ -41,7 +41,8 @@ pub async fn backfill(
 ) -> Result<(), Error> {
     let car = load_car(
         config::USER_DID.clone(),
-        Url::parse(&format!("https://{}/", config::USER_EXPORT_URL)).unwrap(),
+        Url::parse(&format!("https://{}/", config::USER_EXPORT_URL))
+            .expect("env variable USER_EXPORT_URL should be a domain string"),
     )
     .await?;
 
diff --git a/src/config/mod.rs b/src/config/mod.rs
index 89a6a91..9cde13a 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -80,9 +80,9 @@ pub static USER_PDS_URL: ConfigValue<String> = ConfigValue::new_async(|| {
             resolver
                 .pds_for_did(&self::USER_DID)
                 .await
-                .unwrap()
+                .expect("The did document for a user should contain a #atproto_pds service with a url")
                 .domain()
-                .unwrap()
+                .expect("A users pds should have a domain.")
                 .to_string()
         }
     })