Moving code that throws exception into the begin-rescue block
Merge pull request #2595 from abhgupta/abhgupta-dev

Merged by openshift-bot