LUN-911 -- Only do the group checking if the group is set