Ticket [cc1af09637]: Add additional subcommands to error message