changed error message to always include file name