diff --git a/src/server.rs b/src/server.rs
index 6b2561d..7e51f64 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -17,7 +17,7 @@ pub fn serve_request(req: &Request) -> Response {
 fn query(req: &Request) -> Response {
     info!("Handling request: {:?}", req);
     let Some(query) = req.get_param("q") else {
-        return Response::empty_400();
+        return Response::text("Query Parameter q must be specified!").with_status_code(400);
     };
     match query.len() {
         0..=options::query::MIN_LENGTH => {
@@ -40,13 +40,13 @@ fn query(req: &Request) -> Response {
     let response = query_elastic_search(query);
     if let Err(e) = response {
         error!("Error searching: {}", e);
-        return Response::empty_404();
+        return Response::text("No fitting awesome list found :(").with_status_code(404);
     }
     let response = response.unwrap();
 
     let Some(name) = response.split('.').next() else {
         error!("Error getting name from response!");
-        return Response::empty_404();
+        return Response::text("No fitting awesome list found :(").with_status_code(404);
     };
 
     info!("Redirecting to: /{}", name);