UPDATE: Catching interrupt and calling cleanup