some better error handling
Merge pull request #14 from mrkrstphr/error-handling

some better error handling