don't rescue Exception class...too broad
Merge pull request #1241 from stensonb/master

don't rescue Exception class...too broad