diff --git a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_HWMappingSvc.cxx b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_HWMappingSvc.cxx
index c083e2590cdc756f4646f886814cf65f384d8ee3..6d97ce22ff00aa93be1a078294b6fc639a7ca370 100644
--- a/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_HWMappingSvc.cxx
+++ b/InnerDetector/InDetConditions/TRT_ConditionsServices/src/TRT_HWMappingSvc.cxx
@@ -415,6 +415,7 @@ StatusCode TRT_HWMappingSvc::build_BarrelHVLinePadMap() {
     TRTcoralClient->get_BarrelHVLinePadMap( rawMap );
     if ( rawMap.size() == 0 ) {
       msg(MSG::WARNING) << "Retrieved and empty Barrel HV-line/pad map from database." << endmsg;
+      delete TRTcoralClient;
       return StatusCode::FAILURE;
     }
 
@@ -460,7 +461,7 @@ StatusCode TRT_HWMappingSvc::build_BarrelHVLinePadMap() {
         m_Barrel_HV_CoolChanNames->at(hashedPad) = chanName;
       }
     }
-
+    delete TRTcoralClient;
 
   } else {
     std::map< std::string, std::vector<int> > fuseBoxPadMapEven;