added check for None job_step