--- java/branches/ecal-recon_HPSJAVA-93/src/main/java/org/hps/recon/ecal/EcalClusterIC.java	2014-04-18 19:05:31 UTC (rev 504)
+++ java/branches/ecal-recon_HPSJAVA-93/src/main/java/org/hps/recon/ecal/EcalClusterIC.java	2014-04-21 19:03:07 UTC (rev 505)
@@ -205,7 +205,7 @@

             
         	Collections.sort(neighborHits2, new EnergyComparator());
         	for(CalorimeterHit neighbor : neighborHits2){

-        		if(neighbor.getCorrectedEnergy()<nHit.getCorrectedEnergy()){

+        		if(clusterHits.containsKey(nHit) && neighbor.getCorrectedEnergy()<nHit.getCorrectedEnergy()){

         			CalorimeterHit seed = clusterHits.get(nHit);
 					clusterHits.put(neighbor, seed);
 					clusterHitList.add(neighbor);

@@ -231,7 +231,7 @@

             	
             	CalorimeterHit compSeed = clusterHits.get(mHit);
             	for(CalorimeterHit neighbor : neighborHits3){

-            		if(clusterHits.get(neighbor)!=compSeed){//borders clusters

+            		if(clusterHits.containsKey(neighbor) && clusterHits.get(neighbor)!=compSeed){//borders clusters

             			if(mHit.getCorrectedEnergy() < neighbor.getCorrectedEnergy()){
             				//add to common hits, 
             				List<CalorimeterHit> commonHitList = new ArrayList<CalorimeterHit>();