@sguada the last entry is supposed to have func set to NULL to terminate the command dispatch loop down on line 354. This change doesn't look safe to me, but maybe I'm missing something?