change conditions and error message