Attempt to fix error handling
Merge pull request #12 from colonyamerican/fix-error-handling

Attempt to fix error handling