This also enables the error message to be translatable. Change-Id: If63ba0f7bc04eb490578c7598875407e796700aa