Move rescue handling to own method