[FIXED JENKINS-23526] Tolerate 'null' result when used creatively

Minor comment: static analysis tools will complain about this construct, because the result may change between two calls