Fix https://issues.jenkins-ci.org/browse/JENKINS-16042
Merge pull request #14 from fdussert/master

Fix NPE for https://issues.jenkins-ci.org/browse/JENKINS-16042