clean up some over-aggressive catches
clean up some over-aggressive catches

woparry/spire,adampingel/spire,codeaudit/spire,AlecZorab/spire,rklaehn/spire,AlecZorab/spire,siddhartha-gadgil/spire,non/spire,tixxit/spire,JackSullivan/spire,guersam/spire,rklaehn/spire,non/spire,adampingel/spire,guersam/spire,tixxit/spire,kevinmeredith/spire,siddhartha-gadgil/spire,codeaudit/spire,woparry/spire,JackSullivan/spire,kevinmeredith/spire