Return empty array if nil
Merge branch 'hotfix/empty-related-combos'