reworking error messages