diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArCellContainerCnv.cxx b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArCellContainerCnv.cxx
index 507d6413a88d8fccc52bb51952815bbfc97265d7..218e275e0894c43316f24ad9d09b8f2934580a4d 100755
--- a/LArCalorimeter/LArCnv/LArAthenaPool/src/LArCellContainerCnv.cxx
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/src/LArCellContainerCnv.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArCellContainerCnv.h"
@@ -32,7 +32,7 @@ LArCellContainerCnv::~LArCellContainerCnv()
 StatusCode LArCellContainerCnv::initialize()
 {
     // Call base clase initialize
-    AthenaPoolConverter::initialize();
+    CHECK(AthenaPoolConverter::initialize());
 
     // Get the messaging service, print where you are
     MsgStream log(msgSvc(), "LArCellContainerCnv");
diff --git a/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc b/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc
index af19e279f91d3bc808f0455cda692f20d6197562..5ea7d1d6ee3cfa05921deb3f4214a6d9c6882eb0 100644
--- a/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc
+++ b/LArCalorimeter/LArG4/LArG4H6SD/src/RadLenNtuple.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "RadLenNtuple.h"
@@ -43,7 +43,7 @@ namespace G4UA
       m_xcoord = (*p)->production_vertex()->point3d().x();
     }
    
-    ntupleSvc()->writeRecord("/NTUPLES/FILE1/RadLenNtuple/radlen");
+    ntupleSvc()->writeRecord("/NTUPLES/FILE1/RadLenNtuple/radlen").ignore();
 
   }
 
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx
index 6de274e23b6990636c068271213c91e410f2a0bf..f639b09fb78dabe77ff64fcbf5093d4ee9a015c1 100644
--- a/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/AODReader.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -195,7 +195,7 @@ StatusCode AODReader::execute()
 			m_truth_pz = 0;
 		}
 		// writing a record
-		ntupleSvc()->writeRecord(m_nt);
+		ATH_CHECK(ntupleSvc()->writeRecord(m_nt));
 		msg(MSG::VERBOSE) << "n tuple entry writed" << endmsg;
     }
   }
diff --git a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
index f138da8a0cf4cc1522957c41a06eeff306712e9e..f81504f8783e80378d1036d2e1aa9469b8c2740b 100755
--- a/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
+++ b/LArCalorimeter/LArG4/LArG4Validation/src/SingleTrackValidation.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "SingleTrackValidation.h"
@@ -572,7 +572,7 @@ StatusCode SingleTrackValidation::execute() {
       }
     }
 
-    ntupleSvc()->writeRecord(m_c->nt);
+    ATH_CHECK(ntupleSvc()->writeRecord(m_c->nt));
       
   }
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx
index 9e656fe86677714a078af83306daa804253564c9..511d9307ffd29b603cdc2f9c53fb1307ce21a616 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorFactoryH62002.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorFactoryH62002.h"
@@ -473,8 +473,8 @@ void LArGeo::LArDetectorFactoryH62002::create(GeoPhysVol *world)
 
 
 
-  m_detectorStore->record(hecDetManager,hecDetManager->getName());
-  m_detectorStore->record(emecDetectorManager,emecDetectorManager->getName());
+  m_detectorStore->record(hecDetManager,hecDetManager->getName()).ignore();
+  m_detectorStore->record(emecDetectorManager,emecDetectorManager->getName()).ignore();
   m_detectorManager = new LArDetectorManager(0,emecDetectorManager,hecDetManager,0);
 
   m_detectorManager->addTreeTop(expHallPhys);
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorToolH62002.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorToolH62002.cxx
index 845077fd57ececf4d61464314d1ea4a43586e87a..fda206d7182d08c90efdf6975342473cedc63af0 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorToolH62002.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62002Algs/src/LArDetectorToolH62002.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorToolH62002.h"
@@ -51,13 +51,13 @@ LArDetectorToolH62002::create()
   
   // Get the detector configuration.
   IGeoDbTagSvc *geoDbTag;
-  service ("GeoModelSvc",geoDbTag);
+  ATH_CHECK(service ("GeoModelSvc",geoDbTag));
   
   std::string AtlasVersion = geoDbTag->atlasVersion();
   std::string LArVersion   = geoDbTag->LAr_VersionOverride();
 
   IRDBAccessSvc *accessSvc;
-  service("RDBAccessSvc",accessSvc);
+  ATH_CHECK(service("RDBAccessSvc",accessSvc));
 
   std::string detectorKey  = LArVersion.empty() ? AtlasVersion : LArVersion;
   std::string detectorNode = LArVersion.empty() ? "ATLAS" : "LAr";
@@ -109,7 +109,8 @@ LArDetectorToolH62002::create()
     }
     // Register the H62002Node instance with the Transient Detector Store
     theExpt->addManager(theLArFactory.getDetectorManager());
-    detStore()->record(theLArFactory.getDetectorManager(),theLArFactory.getDetectorManager()->getName());
+    ATH_CHECK(detStore()->record(theLArFactory.getDetectorManager(),
+                                 theLArFactory.getDetectorManager()->getName()));
 
 
     return StatusCode::SUCCESS;
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorFactoryH62003.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorFactoryH62003.cxx
index 0048d6b818466242539bcf06d3fa1af050259c7d..82a90eb42da1ba3dde7f87841dcaa4e0aca1d393 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorFactoryH62003.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorFactoryH62003.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorFactoryH62003.h"
@@ -106,7 +106,7 @@ void LArGeo::LArDetectorFactoryH62003::create( GeoPhysVol* a_container )
     }
   }
 
-  detStore->record(fcalDetectorManager,fcalDetectorManager->getName());
+  detStore->record(fcalDetectorManager,fcalDetectorManager->getName()).ignore();
   m_detectorManager = new LArDetectorManager(0,0,0,fcalDetectorManager);
   m_detectorManager->addTreeTop(Envelope);
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorToolH62003.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorToolH62003.cxx
index b2f4fb4eb238d56841f77dfa533f421968306992..63eb72eb63572f4436c6471f9cf536cea06db1ae 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorToolH62003.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62003Algs/src/LArDetectorToolH62003.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorToolH62003.h"
@@ -35,13 +35,13 @@ StatusCode LArDetectorToolH62003::create()
 
   // Get the detector configuration.
   IGeoDbTagSvc *geoDbTag;
-  service ("GeoDbTagSvc",geoDbTag);
+  ATH_CHECK(service ("GeoDbTagSvc",geoDbTag));
 
   std::string AtlasVersion = geoDbTag->atlasVersion();
   std::string LArVersion   = geoDbTag->LAr_VersionOverride();
 
   IRDBAccessSvc *accessSvc;
-  service("RDBAccessSvc",accessSvc);
+  ATH_CHECK(service("RDBAccessSvc",accessSvc));
 
   std::string detectorKey  = LArVersion.empty() ? AtlasVersion : LArVersion;
   std::string detectorNode = LArVersion.empty() ? "ATLAS" : "LAr";
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx
index a8956ab62e7db0a8b66c90a42490e1f9821d2f7c..22235466254d280848abd4112c6bc456d3473f4a 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorFactoryH62004.h"
@@ -439,7 +439,7 @@ const LArDetectorManager *LArGeo::LArDetectorFactoryH62004::getDetectorManager()
 }
 
 
-StatusCode LArGeo::LArDetectorFactoryH62004::storeDDE()
+void LArGeo::LArDetectorFactoryH62004::storeDDE()
 {
    CaloDetDescrElementContainer *cDDEvec = new CaloDetDescrElementContainer() ;
 
@@ -525,6 +525,4 @@ StatusCode LArGeo::LArDetectorFactoryH62004::storeDDE()
    if(sc != StatusCode::SUCCESS) {
        std::cout<<"LArDetectorFactoryH62004::storeDDE could not record the ColdTC caloDDE !!!"<<std::endl;
    }
-   return sc;   
 }
-
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.h b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.h
index 28b9ad5ebf017f815dffa433c94eee2976f6541b..07857a49c707d123be66948aac572393236132fe 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.h
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/LArDetectorFactoryH62004.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LArDetectorFactoryH62004_h
@@ -30,7 +30,7 @@ namespace LArGeo {
     //
     virtual const LArDetectorManager * getDetectorManager() const;
     // Additional creation of CaloDDE for ColdTC
-    StatusCode storeDDE();
+    void storeDDE();
     
     
   private:  
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx
index 8fafe7b9f39515bfbffe536dabdf72fc07c79dd1..3000815bdbca4d0ff34c13dba14d974113a70c33 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorFactoryTBEC.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 // LArDetectorFactory.cxx
@@ -195,7 +195,7 @@ void LArGeo::LArDetectorFactoryTBEC::create( GeoPhysVol* a_container )
     EMECDetectorRegion *presamplerRegion = new EMECDetectorRegion(PresamplerEnvelope,presamplerDetDescr,EMECDetectorRegion::POS);
     emecDetectorManager->addDetectorRegion(presamplerRegion);
   }                                                                  
-  detStore->record(emecDetectorManager,emecDetectorManager->getName());
+  detStore->record(emecDetectorManager,emecDetectorManager->getName()).ignore();
   m_detectorManager = new LArDetectorManager(0,emecDetectorManager,0,0);
   m_detectorManager->addTreeTop(Envelope);
 
diff --git a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorToolTBEC.cxx b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorToolTBEC.cxx
index 92368d3b39bbf1936c688623eb56fcf8770d479f..3a328f60ac42af3e3d6c395cbf8d87dec8c242ae 100755
--- a/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorToolTBEC.cxx
+++ b/LArCalorimeter/LArGeoModel/LArGeoTBEC/src/LArDetectorToolTBEC.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArDetectorToolTBEC.h"
@@ -31,13 +31,13 @@ StatusCode LArDetectorToolTBEC::create()
 
   // Get the detector configuration.
   IGeoDbTagSvc *geoDbTag;
-  service ("GeoDbTagSvc",geoDbTag);
+  ATH_CHECK(service ("GeoDbTagSvc",geoDbTag));
 
   std::string AtlasVersion = geoDbTag->atlasVersion();
   std::string LArVersion   = geoDbTag->LAr_VersionOverride();
 
   IRDBAccessSvc *accessSvc;
-  service("RDBAccessSvc",accessSvc);
+  ATH_CHECK(service("RDBAccessSvc",accessSvc));
 
   std::string detectorKey  = LArVersion.empty() ? AtlasVersion : LArVersion;
   std::string detectorNode = LArVersion.empty() ? "ATLAS" : "LAr";
diff --git a/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx b/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx
index af68292c7f044327cf787ab2f09e489dc67e3705..f009727c108e1797c46c104f4e8da35ab21be775 100644
--- a/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx
+++ b/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -162,7 +162,7 @@ StatusCode LArCellFakeProbElectronics::read_problems()
 /////////////////////////////////////
 // add cell to  list of dead cells //
 /////////////////////////////////////
-StatusCode LArCellFakeProbElectronics::add_cell(int iBarrel,int iSide,int iFT,int iSlot,int iChannel,double weight)
+void LArCellFakeProbElectronics::add_cell(int iBarrel,int iSide,int iFT,int iSlot,int iChannel,double weight)
 {
   try {
     HWIdentifier l_channelId = m_onlineHelper->channel_Id (iBarrel,
@@ -184,6 +184,4 @@ StatusCode LArCellFakeProbElectronics::add_cell(int iBarrel,int iSide,int iFT,in
                     << iChannel 
                     );
   }
-  
-  return StatusCode::SUCCESS;
 }
diff --git a/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.h b/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.h
index cacbbc9aba06a2830d96bdc2e878b4c43a218c5b..4864b198cc4ac3b5102ee27ac3aa93d64fcb8d95 100644
--- a/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.h
+++ b/LArCalorimeter/LArRecUtils/src/LArCellFakeProbElectronics.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef LARRECUTILS_LARCELLFAKEPROBELECTRONICS_H
@@ -46,7 +46,7 @@ class LArCellFakeProbElectronics :  public AthAlgTool, virtual public ICellWeigh
  private:
 
   /*! process jobOptions and add affected cells to list */
-  StatusCode add_cell(int iBarrel,int iSide,int iFT,int iSlot,int iChannel, double weight);
+  void add_cell(int iBarrel,int iSide,int iFT,int iSlot,int iChannel, double weight);
 
   /*! pointer to LArCablingLegacyService */
   LArCablingLegacyService* m_cablingService;
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
index af934d85d885a4a8c56fe2be035bbb8ca58e3acd..a1e23906d30454a9aa52c13cb64e88f3b25134c9 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArFecLvTempDcsTest.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -74,9 +74,9 @@ StatusCode LArFecLvTempDcsTest::execute()
 
     for ( std::vector<HWIdentifier>::const_iterator i=onlineID->feb_begin();
 	  i!=onlineID->feb_end();++i) {
-        ATH_MSG_DEBUG ( " HWIdentifier : " << *i );
-	m_tool->getFec(*i,fec);
-	fec.print( msg() );
+      ATH_MSG_DEBUG ( " HWIdentifier : " << *i );
+      ATH_CHECK(m_tool->getFec(*i,fec));
+      fec.print( msg() );
     }
 
     return sc ;
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx
index 00249bc01c2dcf28f43b9ca787ff183aa7fa6d1c..4ecb50527e5ab79a32818fd3501f68dfade2c065 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArCalibTest/LArReadHadDMCoeffFile.h"
@@ -24,7 +24,7 @@ LArReadHadDMCoeffFile::~LArReadHadDMCoeffFile() {}
                             
 StatusCode LArReadHadDMCoeffFile::initialize() {
    ATH_MSG_INFO ( "=== LArReadHadDMCoeffFile::initialize() ===" );
-   initDataFromFile(m_hadDMCoeffFileName);
+   ATH_CHECK(initDataFromFile(m_hadDMCoeffFileName));
 
    if(msgLvl (MSG::DEBUG)) m_data->PrintData();
 
diff --git a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx
index 2aa40c0b3add894a20ba25d4b7290735b23a87f1..b6d102ae64e5628c6c1b3e9d7684c9bfe72c5d0f 100755
--- a/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx
+++ b/LArCalorimeter/LArTest/LArCalibTest/src/LArReadHadDMCoeffFile2.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #include "LArCalibTest/LArReadHadDMCoeffFile2.h"
@@ -30,7 +30,7 @@ initialize
 *************************************************************************** */
 StatusCode LArReadHadDMCoeffFile2::initialize() {
    ATH_MSG_INFO ( "=== LArReadHadDMCoeffFile2::initialize() ===  m_key:" << m_key );
-   initDataFromFile(m_hadDMCoeffFileName);
+   ATH_CHECK(initDataFromFile(m_hadDMCoeffFileName));
 
    if(msgLvl(MSG::DEBUG)) m_data->PrintData(std::cout);
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
index 5e9d9ae74b822a409d7db80e391c247e1ed348bf..5e3a4349ba687edf598cb663d2dc1ef706594efc 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
+++ b/LArCalorimeter/LArTest/LArConditionsTest/src/LArConditionsTestAlg.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
@@ -208,8 +208,8 @@ StatusCode LArConditionsTestAlg::execute()
 
 StatusCode LArConditionsTestAlg::finalize()
 {
-    if(m_testFill)    testFillIOVDb(); 
-    if(m_testReadDB)  testDbObjectRead(); 
+    if(m_testFill)    ATH_CHECK(testFillIOVDb());
+    if(m_testReadDB)  ATH_CHECK(testDbObjectRead());
     return StatusCode::SUCCESS; 
 }