Fixed add job check to be after existing job lookup