Added filenames to error messages for all modules