Merge pull request #78 from polynickglot/master

Add error handling