diff --git a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
index 890c3821376730f054fc0871f15e763ac198ec8e..efe6df5e841cac46841c474f60c99e36f5467fec 100644
--- a/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmRecEventHeaderConverter.cxx
@@ -80,7 +80,8 @@ void CbmRecEventHeaderConverter::ProcessData(CbmEvent* event)
 
     tStartTS = fTimeSlice->GetStartTime();
 
-    if (event->GetMatch()) match_weight = float(event->GetMatch()->GetMatchedLink().GetWeight());
+    if (event->GetMatch() && event->GetMatch()->GetNofLinks() > 0)
+      match_weight = float(event->GetMatch()->GetMatchedLink().GetWeight());
     else
       match_weight = 0.;
   }
diff --git a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
index cf8120b2c7b289f6024355e538623820ecd10646..497adf858ed18738a5bfdee2cde43b628fde5956 100644
--- a/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimEventHeaderConverter.cxx
@@ -59,11 +59,7 @@ void CbmSimEventHeaderConverter::ProcessData(CbmEvent* event)
   FairMCEventHeader* cbm_header {nullptr};
   int file_id {0}, event_id {0};
 
-  if (event) {
-    if (!event->GetMatch()) {
-      LOG(error) << "No match to SimEvent!";
-      return;
-    }
+  if (event && event->GetMatch() && event->GetMatch()->GetNofLinks() > 0) {
     const auto& link = event->GetMatch()->GetMatchedLink();
     file_id          = event->GetMatch()->GetMatchedLink().GetFile();
     event_id         = event->GetMatch()->GetMatchedLink().GetEntry();
diff --git a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
index 9d130fa47986cc9afd74f9c29093b8b7a0cdc635..bd8d4677e070e0650de977791d3349c32f016ee2 100644
--- a/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmSimTracksConverter.cxx
@@ -108,9 +108,7 @@ void CbmSimTracksConverter::ProcessData(CbmEvent* event)
   const auto& branch = out_config_->GetBranchConfig(out_branch_);
 
   int file_id {0}, event_id {0};
-  if (event) {
-    auto match = event->GetMatch();
-    if (!match) return;
+  if (event && event->GetMatch() && event->GetMatch()->GetNofLinks() > 0) {
     file_id  = event->GetMatch()->GetMatchedLink().GetFile();
     event_id = event->GetMatch()->GetMatchedLink().GetEntry();
   }
diff --git a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
index 6f7a3f180ac3e5c88dad966d6f3274c17b143c7e..580d08a72230f563aa83d4c4702016427b25bb70 100644
--- a/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmStsTracksConverter.cxx
@@ -246,7 +246,7 @@ void CbmStsTracksConverter::MapTracks(CbmEvent* event)
   CbmTrackMatchNew* match {nullptr};
 
   int file_id {0}, event_id {0};
-  if (event) {
+  if (event && event->GetMatch()->GetNofLinks() > 0) {
     file_id  = event->GetMatch()->GetMatchedLink().GetFile();
     event_id = event->GetMatch()->GetMatchedLink().GetEntry();
   }
diff --git a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
index 8169f293097eeacbd2b923ecef2193070319b2f4..c93648cedc491bc3e69fcf35f9187d68f4e39366 100644
--- a/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
+++ b/analysis/common/analysis_tree_converter/CbmTofHitsConverter.cxx
@@ -85,9 +85,7 @@ void CbmTofHitsConverter::ProcessData(CbmEvent* event)
   auto sim_tracks_map = GetMatchMap(mc_tracks_);
 
   int file_id {0}, event_id {0};
-  if (event) {
-    auto match = event->GetMatch();
-    if (!match) return;
+  if (event && event->GetMatch() && event->GetMatch()->GetNofLinks() > 0) {
     file_id  = event->GetMatch()->GetMatchedLink().GetFile();
     event_id = event->GetMatch()->GetMatchedLink().GetEntry();
   }