Correctly handle failed subcommands