Improve CLI error messages.