Use inline rescue
Merge pull request #70 from Dparker1990/refactor_resolve

Use inline rescue