Merge "Fixing NPE when a group has NULL account"