fix error handler
Merge pull request #43 from codemix/performance-tweaks

fix error handler