Checks if groups is none before extending it
Merge pull request #4160 from mschartman/develop

Checks if groups is none before extending it