Add rescue for clean operation