psychon Merge pull request #13 from osch/error-handling