NPE related to ContentGroups after editing Contents

This might have been introduced by !94 (merged).

@tksl38