[FIXED JENKINS-19684] Add null safety