Improve CLI execution error handling