Unify the command handler code

[ravener]

The command handler is prone to breaking DRY (Don't Repeat Yourself), repeating checks and such, it'd be wise to unify the checks in one place and re-use it with both.