Error handler added
Merge pull request #1 from gfronza/master

Error Handler