[FIXED JENKINS-22582] Do a null-check to prevent failing form submission