Fix NPE in ClusterMap method