Issue #389 - Error handler protection