diff --git a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
index 7da27bdaece97cf58d36d85580ce9fbba08befeb..ccfbbfcb8d372b1f166cb08c8d276615a796d52d 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileDigitsMaker.cxx
@@ -511,8 +511,13 @@ StatusCode TileDigitsMaker::execute() {
     } else {
       ATH_MSG_DEBUG( "TileRawChannelContainer for DQ check retrieved");
     }
-    TimedRawChanContList::iterator iTzeroRawChanCont(rawchanContList.begin());
-    const TileRawChannelContainer * rndm_rawchan_container = (iTzeroRawChanCont->second);
+
+    const TileRawChannelContainer* rndm_rawchan_container(nullptr);
+    if (!rawchanContList.empty()) {
+      TimedRawChanContList::iterator iTzeroRawChanCont(rawchanContList.begin());
+      rndm_rawchan_container = iTzeroRawChanCont->second;
+    }
+
     ATH_MSG_DEBUG( "setContainer method being called in TileDigitsMaker");
     m_beamInfo->setContainers(rndm_digit_container, rndm_rawchan_container);
     ATH_MSG_DEBUG( "Containers successfully set in TileBeamInfoProvider");
diff --git a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
index 540ad8029554547c15de32984e36d1ca3388dcea..0b207e19daa8eaa916a2bce13d8ff28d269614be 100644
--- a/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
+++ b/TileCalorimeter/TileSimAlgs/src/TileHitVecToCntTool.cxx
@@ -478,7 +478,7 @@ void TileHitVecToCntTool::processHitVectorForPileUp(const TileHitVector* inputHi
     eHitTot += ener;
 
     TileHit * pHit = m_allHits[hit_idhash];
-    TileHit * pHit_DigiHSTruth;
+    TileHit * pHit_DigiHSTruth(nullptr);
     if(m_doDigiTruth) pHit_DigiHSTruth = m_allHits_DigiHSTruth[hit_idhash];
 
     if (0 == pHit) {
@@ -935,7 +935,7 @@ StatusCode TileHitVecToCntTool::mergeEvent() {
 
     for (; iHit != lastHit; ++iHit) {
       TileHit *pHit = (*iHit);
-      TileHit *pHit_DigiHSTruth;
+      TileHit *pHit_DigiHSTruth(nullptr);
       if(m_doDigiTruth) pHit_DigiHSTruth = new TileHit(**iHit_DigiHSTruth);
       if (pHit->size() > 1 || pHit->energy() != 0.0) {       // hit exists
         m_hits->push_back(pHit);   // store hit in container