diff --git a/src/api/admin/bucket.rs b/src/api/admin/bucket.rs
index dacbd427..2c21edee 100644
--- a/src/api/admin/bucket.rs
+++ b/src/api/admin/bucket.rs
@@ -95,7 +95,7 @@ pub async fn handle_get_bucket_info(
 			.bucket_helper()
 			.resolve_global_bucket_name(&ga)
 			.await?
-			.ok_or_bad_request("Bucket not found")?,
+			.ok_or_else(|| HelperError::NoSuchBucket(ga.to_string()))?,
 		_ => {
 			return Err(Error::bad_request(
 				"Either id or globalAlias must be provided (but not both)",
diff --git a/src/api/admin/error.rs b/src/api/admin/error.rs
index cd7e6af7..592440a5 100644
--- a/src/api/admin/error.rs
+++ b/src/api/admin/error.rs
@@ -2,7 +2,7 @@ use err_derive::Error;
 use hyper::header::HeaderValue;
 use hyper::{Body, HeaderMap, StatusCode};
 
-use garage_model::helper::error::Error as HelperError;
+pub use garage_model::helper::error::Error as HelperError;
 
 use crate::common_error::CommonError;
 pub use crate::common_error::{CommonErrorDerivative, OkOrBadRequest, OkOrInternalError};