[Reg-zahr] Upcoming changes in error messages