More elimination of error message litter to fix [Bug 20a81392ec].