fix OOIION-1587
Merge pull request #1617 from carueda/OOIION-1587_rebase2

fix OOIION-1587
Stylistic change to better handle except blocks. All relevant tests still pass. No action on integration testing.
EH