fixed NPE of [JENKINS-8243]