added some additional exceptions to the rescue statement