This fixes #7915.  It now makes sure the group is the same.
This fixes #7916.  It now will only try to log the error once, and will die if that has a fatal error.