Add back rescue of rescue time errors