Change error messages

ARMSTWO-27 #DONE