Make dispatcher robust
Merge pull request #119 from DoumanAsh/robust_dispatcher

Make dispatcher robust