Added context to error messages