Merge pull request #901 from Blewzman/FixAggregateExceptionGetBaseException