Fix NPE when reverting empty BufferAggregate
Integration