Add context to error messages