Merge pull request #46 from DoumanAsh/master

More specific exception catching for dispatchers