Fix CLI error handling/messages.