Make rescue play nice to fix issue #11705

More info on 'rescue Exception => ex' vs 'rescue => ex' can be found in this blog post by @mperham: http://www.mikeperham.com/2012/03/03/the-perils-of-rescue-exception/