Strict null check on group parameter
Merge pull request #2180 from bcrowe/hotfix-strict

Strict null check on group parameter