Merge "Simplify error handling in subcommand execution"