allow for error handling
Merge pull request #2 from remster/master

allow for error handling