Added extra rescue on update