Adding back runtime rescue