Merge "Fix the text of the error message, in the case of service specific error"