Rethrow caught message handling errors after emitting
Merge pull request #272 from ishbu/master

Rethrow caught message handling errors after emitting