diff --git a/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx b/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
index b9352ef88b9c6294853f1831f9be1d49f9d9e27e..22c33e884905ba0574d339fcbd550fbcf5c6b264 100644
--- a/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
+++ b/Calorimeter/CaloRec/src/CaloCellContainerFinalizerTool.cxx
@@ -38,7 +38,8 @@ CaloCellContainerFinalizerTool::CaloCellContainerFinalizerTool(
 			     const std::string& type, 
 			     const std::string& name, 
 			     const IInterface* parent)
-  :AthAlgTool(type, name, parent) 
+  :AthAlgTool(type, name, parent),
+   m_theCaloCCIDM(nullptr)
 {
   declareInterface<ICaloCellMakerTool>(this); 
   declareInterface<ICaloConstCellMakerTool>(this); 
diff --git a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
index 1d3312a7ac0c2733b4fdca4b137741984d73743a..c390034bdb6474634f7c8bd2d243e31f0e8ed966 100755
--- a/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
+++ b/Calorimeter/CaloRec/src/CaloClusterMomentsMaker_DigiHSTruth.cxx
@@ -459,7 +459,7 @@ CaloClusterMomentsMaker_DigiHSTruth::execute(const EventContext& /*ctx*/,
 	  }
 	}
 	else {
-	  if ( myCDDE && ! (myCDDE->is_tile()) 
+	  if ( ! (myCDDE->is_tile()) 
 	       && ((pCell->provenance() & 0x2000) == 0x2000) 
 	       && !((pCell->provenance() & 0x0800) == 0x0800)) {
 	    if ( pCell->quality() > m_minBadLArQuality ) {
@@ -468,7 +468,7 @@ CaloClusterMomentsMaker_DigiHSTruth::execute(const EventContext& /*ctx*/,
 	    eLAr2  += ene*weight*ene*weight;
 	    eLAr2Q += ene*weight*ene*weight*pCell->quality();
 	  }
-	  if ( myCDDE && myCDDE->is_tile() ) {
+	  if ( myCDDE->is_tile() ) {
 	    uint16_t tq = pCell->quality();
 	    uint8_t tq1 = (0xFF00&tq)>>8; // quality in channel 1
 	    uint8_t tq2 = (0xFF&tq); // quality in channel 2
@@ -513,7 +513,7 @@ CaloClusterMomentsMaker_DigiHSTruth::execute(const EventContext& /*ctx*/,
 	  double Sig = (sigma>0?ene*weight/sigma:0);
 	  if ( fabs(Sig) > fabs(maxAbsSig) ) {
 	    maxAbsSig = Sig;
-	    nSigSampl = myCDDE->getSampling();
+            nSigSampl = myCDDE->getSampling();
 	  }
 	}
 	if ( m_calculateIsolation ) {
@@ -541,7 +541,7 @@ CaloClusterMomentsMaker_DigiHSTruth::execute(const EventContext& /*ctx*/,
 	  }
 	}
 
-	if ( myCDDE && ene > 0. && weight > 0) {
+	if ( ene > 0. && weight > 0) {
 	  // get all geometric information needed ...
           CaloClusterMomentsMaker_detail::cellinfo& ci = cellinfo[ncell];
 	  ci.x      = myCDDE->x();