JENKINS-20929
possible NPE fixed