diff --git a/src/lib.rs b/src/lib.rs
index 14c50563baa6..7834dfd26874 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -325,7 +325,14 @@ where
         }
         visitor.format_separate_mod(module, &*filemap);
 
-        has_diff |= after_file(path_str, &mut visitor.buffer)?;
+        has_diff |= match after_file(path_str, &mut visitor.buffer) {
+            Ok(result) => result,
+            Err(e) => {
+                // Create a new error with path_str to help users see which files failed
+                let mut err_msg = path_str.to_string() + &": ".to_string() + &e.to_string();
+                return Err(io::Error::new(e.kind(), err_msg));
+            }
+        };
 
         result.push((path_str.to_owned(), visitor.buffer));
     }