Add error catching for dynamic origin checking.
Merge pull request #14 from agrueneberg/v2-error-handling

Add error catching for dynamic origin checking