Another fix to Coverity 1147770. First fix had some flaws. TRQ-2424