handler: 'TODO: don't let IndexErrors happen' is not something you just leave alone... fixed IndexErrors when a parameter-expecting argument is provided at the end of a command.