Simplify error handler
Merge pull request #1 from vesln/simplify-handler

Simplify error handler