Try to handle aggregate() returning None instead of 0 [10709261]