am ff91ec35: Tolerate crashes during re-aggregation.

* commit 'ff91ec356f1b17dea095a880f61b8bc4ff333b1e':
  Tolerate crashes during re-aggregation.