Options: Add check for empty groups