Avoid error handler invocation
Merge pull request #128 from brablc/master

Avoid error handler invocation