[JENKINS-15820] Fix NPE