diff --git a/core/base/CbmMatchRecoToMC.cxx b/core/base/CbmMatchRecoToMC.cxx
index 548c5436933282c9e21f227bd5f92292aee0e5bb..87679fd35082499e11395bfb3878311c599b3061 100644
--- a/core/base/CbmMatchRecoToMC.cxx
+++ b/core/base/CbmMatchRecoToMC.cxx
@@ -424,6 +424,10 @@ void CbmMatchRecoToMC::MatchClusters(ECbmModuleId systemId, const TClonesArray*
     for (Int_t iDigi = 0; iDigi < nofDigis; iDigi++) {
       Int_t digiIndex           = cluster->GetDigi(iDigi);
       const CbmMatch* digiMatch = fDigiManager->GetMatch(systemId, digiIndex);
+      if (nullptr == digiMatch) {
+        LOG(fatal) << "CbmMatchRecoToMC::MatchClusters => no Match found for system " << systemId << " digi index "
+                   << digiIndex << " (digi " << iDigi << " from cluster " << iCluster << ") !";
+      }
       clusterMatch->AddLinks(*digiMatch);
     }  //# digis in cluster
   }    //# clusters