restructure error messages on aro