Minor fix for empty DB case