Don't use a bare exception
Merge pull request #5239 from UtahDave/develop

Don't use a bare exception