Add null checks for all ClusterMap methods that return a collection