diff --git a/core/qa/CbmQaTask.cxx b/core/qa/CbmQaTask.cxx
index 58a6ffc7fc66c1d9e1ec136544c4c5d1c18e7cc1..4dbd7da02c90741763cd16f01d9f3c6d3813ce71 100644
--- a/core/qa/CbmQaTask.cxx
+++ b/core/qa/CbmQaTask.cxx
@@ -44,6 +44,7 @@ void CbmQaTask::Exec(Option_t* /*option*/)
     int nEvents = fpBrEvents->GetEntriesFast();
     for (int iEvt = 0; iEvt < nEvents; ++iEvt) {
       fpCurrentEvent = static_cast<CbmEvent*>(fpBrEvents->At(iEvt));
+      assert(fpCurrentEvent);
       this->InitTimeSlice();
       this->FillHistograms();
       fNofEvents.SetVal(fNofEvents.GetVal() + 1);
diff --git a/reco/L1/CbmCaMCModule.cxx b/reco/L1/CbmCaMCModule.cxx
index cf6408539b60dc24178622a3ac893c157aaaf4c8..6195dbc621a372810448e7c341a493fd4b271955 100644
--- a/reco/L1/CbmCaMCModule.cxx
+++ b/reco/L1/CbmCaMCModule.cxx
@@ -261,8 +261,11 @@ void MCModule::MatchRecoAndMC()
   this->MatchPointsAndHits<ca::EDetectorID::kMuch>();
   this->MatchPointsAndHits<ca::EDetectorID::kTrd>();
   this->MatchPointsAndHits<ca::EDetectorID::kTof>();
+  LOG(info) << "DBG 1";
   this->MatchRecoAndMCTracks();
+  LOG(info) << "DBG 2";
   this->InitTrackInfo();
+  LOG(info) << "DBG 3";
   for (const auto& trkMC : fpMCData->GetTrackContainer()) {
     if (trkMC.IsReconstructable()) {
       fMonitor.IncrementCounter(EMonitorKey::kMcTrackReconstructable);
diff --git a/reco/L1/CbmCaTimeSliceReader.h b/reco/L1/CbmCaTimeSliceReader.h
index 5845553173f5aa98d0d856af789456960ed6916c..2b8df810e2bb7255bd5829f392018253bbc86028 100644
--- a/reco/L1/CbmCaTimeSliceReader.h
+++ b/reco/L1/CbmCaTimeSliceReader.h
@@ -224,6 +224,9 @@ int cbm::ca::TimeSliceReader::ReadHitsForDetector()
 
   for (int iH = 0; iH < nHitsTot; ++iH) {
     int iHext = fpEvent ? fpEvent->GetIndex(kCbmHitType[DetID], iH) : iH;
+    if (iHext < 0) {
+      continue;
+    }
     tools::HitRecord hitRecord;
 
     auto* pHit  = static_cast<Hit_t*>(fvpBrHits[DetID]->At(iHext));