Rearrange and error messages