Ignore @wip
Merge pull request #1 from theodi/error-handling

Ignore @wip