Revert "Quick fix for overly broad rescue"

This reverts commit 9c8f3c4301537fc7ca56262dba18946bfd2f7c9d.