Make error handler call error callback
Merge pull request #12 from kudos/master

Make error handler call error callback