fix rescue in watch