Improve recovery from failing task