[FIXED JENKINS-19305] fixed NPE