LUN-911 -- Only do the group checking if the group is set
Merge pull request #9 from pbs/LUN-911

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