CFY-517 chage messages in case of error