added additional cli sanity checks.