Re-raise the original error if error parsing fails

- re-raise the original error if error parsing fails
- DRY up error handling code
Merge pull request #35 from greysteil/better-error-handling

Re-raise the original error if error parsing fails