Don't die when seeing an aggregate group

Change-Id: I6dbaf3e92155ee80dfe7ee13f7a3b48eefbab887
Merge "Don't die when seeing an aggregate group"