Next attempt to handle coverity correctly