diff --git a/src/web/error.rs b/src/web/error.rs
index 640234a92..b9a8c4479 100644
--- a/src/web/error.rs
+++ b/src/web/error.rs
@@ -144,7 +144,7 @@ mod tests {
                     .next()
                     .unwrap()
                     .text_contents(),
-                "The requested crate does not exist",
+                "The requested resource does not exist",
             );
 
             Ok(())
@@ -190,7 +190,7 @@ mod tests {
                     .next()
                     .unwrap()
                     .text_contents(),
-                "The requested version does not exist",
+                "The requested resource does not exist",
             );
 
             Ok(())
@@ -209,7 +209,7 @@ mod tests {
                     .next()
                     .unwrap()
                     .text_contents(),
-                "The requested version does not exist",
+                "The requested resource does not exist",
             );
 
             Ok(())
@@ -232,7 +232,7 @@ mod tests {
                     .next()
                     .unwrap()
                     .text_contents(),
-                "The requested version does not exist",
+                "The requested resource does not exist",
             );
 
             Ok(())
diff --git a/src/web/mod.rs b/src/web/mod.rs
index 84459fcb4..98e3d5844 100644
--- a/src/web/mod.rs
+++ b/src/web/mod.rs
@@ -183,9 +183,9 @@ impl Handler for CratesfyiHandler {
         // because it gives the most specific errors, e.g. CrateNotFound or VersionNotFound
         self.shared_resource_handler
             .handle(req)
+            .or_else(|e| if_404(e, || self.router_handler.handle(req)))
             .or_else(|e| if_404(e, || self.database_file_handler.handle(req)))
             .or_else(|e| if_404(e, || self.static_handler.handle(req)))
-            .or_else(|e| if_404(e, || self.router_handler.handle(req)))
             .or_else(|e| {
                 let err = if let Some(err) = e.error.downcast::<error::Nope>() {
                     *err