Fix NPE for non aggregated clusters.