Error Messages reorganizations