diff --git a/router/src/server.rs b/router/src/server.rs
index 9ab415d3..a3d5eced 100644
--- a/router/src/server.rs
+++ b/router/src/server.rs
@@ -1824,7 +1824,7 @@ pub async fn run(
 
     let tokenizer: Result<Tokenizer, WebServerError> = {
         use pyo3::prelude::*;
-        match Python::with_gil(|py| -> PyResult<()> {
+        let res = Python::with_gil(|py| -> PyResult<()> {
             py_resolve_tokenizer(py, &tokenizer_name, revision.as_deref(), trust_remote_code)?;
             Ok(())
         })
@@ -1834,13 +1834,11 @@ pub async fn run(
         .or_else(|err| {
             let out = legacy_tokenizer_handle(config_filename.as_ref());
             out.ok_or(err)
-        }) {
-            Ok(_) => {}
-            Err(_) => {
-                return Err(WebServerError::Tokenizer(
-                    "Unable to load tokenizer.".to_string(),
-                ));
-            }
+        }).map_err(|_|WebServerError::Tokenizer(
+            "Unable to load tokenizer.".to_string(),
+        ));
+        if res.is_err(){
+            return res
         }
         let filename = "out/tokenizer.json";
         if let Ok(tok) = tokenizers::Tokenizer::from_file(filename) {