Ensure aggregations are not nil

I had a fundamental misunderstanding with the `:or` clause in map destructuring; my apologies.