Check for missing group before using.
Merge branch 'fix-gallery-group-missing' into develop