Fix not stopping job after early error

Also avoid redudndant cloning of job scope beans.