Fixes Jenkins-24954

The message logic got excluded from the if statement.  Still hunting down the culprit.