Merge pull request #45 from mhuerster/master

error handling