CDAP-821 Improve CLI error messages