OO-531: fix issue with empty catalog