diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/Root/xAODConfigTool.cxx b/Trigger/TrigConfiguration/TrigConfxAOD/Root/xAODConfigTool.cxx
index 51b16f838ca411ef533e7222e9b88f5dfa92c9e4..5f130ccaea54c9f90300620bfec79c99da197226 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/Root/xAODConfigTool.cxx
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/Root/xAODConfigTool.cxx
@@ -277,7 +277,9 @@ namespace TrigConf {
       // Try to read the R2 metadata object:
       m_tmc = nullptr;
       m_triggerMenuContainerAvailable = true;
-      if( inputMetaStore()->retrieve( m_tmc, m_metaName_run2 ).isFailure() ) {
+      if( !inputMetaStore()->contains<xAOD::TriggerMenuContainer>(m_metaName_run2) 
+          or inputMetaStore()->retrieve( m_tmc, m_metaName_run2 ).isFailure() )
+      {
          m_triggerMenuContainerAvailable = false;
       }
 
@@ -288,16 +290,24 @@ namespace TrigConf {
       m_l1psJson = nullptr;
       m_bgJson = nullptr;
       m_menuJSONContainerAvailable = true;
-      if( inputMetaStore()->retrieve( m_hltJson, m_metaNameJSON_hlt ).isFailure() ) {
+      if( !inputMetaStore()->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_hlt) 
+          or inputMetaStore()->retrieve( m_hltJson, m_metaNameJSON_hlt ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
-      if( inputMetaStore()->retrieve( m_l1Json, m_metaNameJSON_l1 ).isFailure() ) {
+      if( !inputMetaStore()->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_l1) 
+          or inputMetaStore()->retrieve( m_l1Json, m_metaNameJSON_l1 ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
-      if( inputMetaStore()->retrieve( m_hltpsJson, m_metaNameJSON_hltps ).isFailure() ) {
+      if( !inputMetaStore()->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_hltps) 
+          or inputMetaStore()->retrieve( m_hltpsJson, m_metaNameJSON_hltps ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
-      if( inputMetaStore()->retrieve( m_l1psJson, m_metaNameJSON_l1ps ).isFailure() ) {
+      if( !inputMetaStore()->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_l1ps) 
+          or inputMetaStore()->retrieve( m_l1psJson, m_metaNameJSON_l1ps ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
       // if( inputMetaStore()->retrieve( m_bgJson, m_metaNameJSON_bg ).isFailure() ) {
diff --git a/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODConfigSvc.cxx b/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODConfigSvc.cxx
index 5ecb14cd5089cbe8f8df3f9b06543ed14757d77b..5786bb3ca30465b6e96ce9481d3163e982586b68 100644
--- a/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODConfigSvc.cxx
+++ b/Trigger/TrigConfiguration/TrigConfxAOD/src/xAODConfigSvc.cxx
@@ -396,7 +396,9 @@ namespace TrigConf {
 
       // Read the R2 metadata object...
       const xAOD::TriggerMenuContainer* input_tmc = nullptr;
-      if( m_metaStore->retrieve( input_tmc, m_metaName ).isFailure() ) {
+      if( !m_metaStore->contains<xAOD::TriggerMenuContainer>(m_metaName) 
+          or m_metaStore->retrieve( input_tmc, m_metaName ).isFailure() )
+      {
          m_triggerMenuContainerAvailable = false;
       }
 
@@ -406,19 +408,29 @@ namespace TrigConf {
       const xAOD::TriggerMenuJsonContainer* input_hltps = nullptr;
       const xAOD::TriggerMenuJsonContainer* input_l1ps = nullptr;
       // const xAOD::TriggerMenuJsonContainer* input_bg = nullptr;
-      if( m_metaStore->retrieve( input_hlt, m_metaNameJSON_hlt ).isFailure() ) {
+      if( !m_metaStore->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_hlt) 
+          or m_metaStore->retrieve( input_hlt, m_metaNameJSON_hlt ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
-      if( m_metaStore->retrieve( input_l1, m_metaNameJSON_l1 ).isFailure() ) {
+      if( !m_metaStore->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_l1) 
+          or m_metaStore->retrieve( input_l1, m_metaNameJSON_l1 ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
-      if( m_metaStore->retrieve( input_hltps, m_metaNameJSON_hltps ).isFailure() ) {
+      if( !m_metaStore->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_hltps) 
+          or m_metaStore->retrieve( input_hltps, m_metaNameJSON_hltps ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
-      if( m_metaStore->retrieve( input_l1ps, m_metaNameJSON_l1ps ).isFailure() ) {
+      if( !m_metaStore->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_l1ps) 
+          or m_metaStore->retrieve( input_l1ps, m_metaNameJSON_l1ps ).isFailure() )
+      {
          m_menuJSONContainerAvailable = false;
       }
-      // if( m_metaStore->retrieve( input_bg, m_metaNameJSON_bg ).isFailure() ) {
+      // if( !m_metaStore->contains<xAOD::TriggerMenuJsonContainer>(m_metaNameJSON_bg) 
+      //     or m_metaStore->retrieve( input_bg, m_metaNameJSON_bg ).isFailure() ) 
+      // {
       //    m_menuJSONContainerAvailable = false;
       // }