[JENKINS-23028] Add additional diagnostics

- should not be null at this point,  but if it is...