diff --git a/runtime/src/file_data.rs b/runtime/src/file_data.rs
index f1f68c1b..e029bca7 100644
--- a/runtime/src/file_data.rs
+++ b/runtime/src/file_data.rs
@@ -415,10 +415,10 @@ fn take_released(held: &mut VecDeque<(u64, Chunk)>, released: Vec<(u64, String)>
             // treats a missing count as "not counted yet" and counts that segment itself, so the
             // document still arrives complete.
             //
-            if let Some(tokenizer) = tokenizer {
-                if let Err(e) = segment.set_token_count(tokenizer) {
-                    warn!("Failed to count the tokens of a released chunk: {e}");
-                }
+            if let Some(tokenizer) = tokenizer
+                && let Err(e) = segment.set_token_count(tokenizer)
+            {
+                warn!("Failed to count the tokens of a released chunk: {e}");
             }
 
             chunks.push(segment);
diff --git a/runtime/src/tokenizer.rs b/runtime/src/tokenizer.rs
index cd3ad19b..a6c4e957 100644
--- a/runtime/src/tokenizer.rs
+++ b/runtime/src/tokenizer.rs
@@ -178,7 +178,7 @@ fn validate_tokenizer_file(path: &PathBuf) -> Result<usize, String> {
 fn handle_tokenizer_store(payload: &TokenizerStorage) -> Result<String, std::io::Error> {
     let data_dir = DATA_DIRECTORY
         .get()
-        .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::Other, "DATA_DIRECTORY not initialized"))?;
+        .ok_or_else(|| std::io::Error::other("DATA_DIRECTORY not initialized"))?;
 
     let base_path = PathBuf::from(data_dir).join("tokenizers");
 
@@ -219,7 +219,7 @@ fn handle_tokenizer_delete(payload: &TokenizerDelete) -> Result<(), std::io::Err
 
     let data_dir = DATA_DIRECTORY
         .get()
-        .ok_or_else(|| std::io::Error::new(std::io::ErrorKind::Other, "DATA_DIRECTORY not initialized"))?;
+        .ok_or_else(|| std::io::Error::other("DATA_DIRECTORY not initialized"))?;
 
     let tokenizer_path = PathBuf::from(data_dir)
         .join("tokenizers")