Improve the cli error handle
Default command support