Maybe also check command id and command name here somehow (since they're being set explicitly in the handler).