Add better error handling
Merge pull request #37 from zendesk/dasch/better-errors

Add better error handling