Simple error handler
Merge pull request #1 from BeGateway/error-handling

Simple error handler