Merge pull request #3 from Chris00/master

 Add error handler