(CE-751) Make confirmation code error messages more user friendly