Merge "CLI: Make sure we don't exit with 0 when an exception is encountered"