[PATCH] cli: slighly more clear error messages