Coverity: fixes in catalog code