diff --git a/crates/apub_lib/src/object_id.rs b/crates/apub_lib/src/object_id.rs
index f7be4452c..f3291a5dc 100644
--- a/crates/apub_lib/src/object_id.rs
+++ b/crates/apub_lib/src/object_id.rs
@@ -25,7 +25,7 @@ lazy_static! {
   static ref CLIENT: Client = Client::builder()
     .user_agent(build_user_agent(&Settings::get()))
     .build()
-    .unwrap();
+    .expect("Couldn't build client");
 }
 
 /// We store Url on the heap because it is quite large (88 bytes).
diff --git a/crates/apub_lib_derive/src/lib.rs b/crates/apub_lib_derive/src/lib.rs
index 72e00fe2b..d548af4c4 100644
--- a/crates/apub_lib_derive/src/lib.rs
+++ b/crates/apub_lib_derive/src/lib.rs
@@ -56,7 +56,7 @@ pub fn derive_activity_handler(input: proc_macro::TokenStream) -> proc_macro::To
     .collect();
   let attrs: &Vec<TokenStream> = &attrs
     .first()
-    .unwrap()
+    .expect("Could not decode first attribute from token stream")
     .tokens
     .clone()
     .into_iter()