Good catch! I thought I've checked that all handled commands return directly, but you're right, that's totally not the case. I'll refactor this.