Make dispatcher robust