Merge "Add context to error message."