Develop merge into master fix crashing issue with job nil date