[JENKINS-13567] Diagnosis for an NPE.
Merge pull request #30 from jglick/JENKINS-13567-diag

[JENKINS-13567] Diagnosis for an NPE.