clarified rescue_from handling