Adding null check to job