added filename to error messages