Merge "Error code support for ErrorMessage"