Merge pull request #3 from kamholz/master

make error handling possible