Revert "prevent null pointer JENKINS-19086"

This reverts commit 87c70511fd93a6375785420809a8fe6e5115bf64.