diff --git a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_LocalOccupancy.cxx b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_LocalOccupancy.cxx
index 192b0669b8ac6b73df665a8622b7dd722337af51..37e39343127127b26f54098f5a3462e38cc2a2ca 100644
--- a/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_LocalOccupancy.cxx
+++ b/InnerDetector/InDetRecTools/TRT_ElectronPidTools/src/TRT_LocalOccupancy.cxx
@@ -1,4 +1,3 @@
-
 /*
   Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
@@ -82,8 +81,8 @@ StatusCode TRT_LocalOccupancy::initialize()
   ATH_MSG_INFO ("initialize() successful in " << name());
 
   //Initlalize ReadHandleKey
-  ATH_CHECK( m_trt_rdo_location.initialize(!m_trt_rdo_location.empty()) );
-  ATH_CHECK( m_trt_driftcircles.initialize(!m_trt_driftcircles.empty()) );
+  ATH_CHECK( m_trt_rdo_location.initialize( m_isTrigger));
+  ATH_CHECK( m_trt_driftcircles.initialize( SG::AllowEmpty));
   ATH_CHECK( m_strawReadKey.initialize() );
 
   std::string OccupancyCacheName = name() + "OccupancyData";
@@ -284,13 +283,9 @@ void
 TRT_LocalOccupancy::countHitsNearTrack (OccupancyData& data,
                                         int track_local[NLOCAL][NLOCALPHI]) const
 {
-    if ( m_trt_rdo_location.empty() ) {
-      ATH_MSG_DEBUG( "TRT_RDO_Container key is empty" );
-      return;
-    }
     SG::ReadHandle<TRT_RDO_Container> p_trtRDOContainer(m_trt_rdo_location);
     if ( !p_trtRDOContainer.isValid() ) {
-      ATH_MSG_DEBUG( "Could not find the TRT_RDO_Container "
+      ATH_MSG_ERROR( "Could not find the TRT_RDO_Container "
 		     << m_trt_rdo_location.key() );
       return;
     }
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py
index 4b2a651db8fb92185abdbe4686eb1d1394e910aa..4eac7b9fc2c2ff554466f35eb6162258404ff66d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences_GSF.py
@@ -38,8 +38,9 @@ def precisionElectronRecoSequence_GSF(RoIs):
     from AthenaCommon.GlobalFlags import globalflags
     if (globalflags.InputFormat.is_bytestream()):
       ViewVerifyTrk_GSF.DataObjects += [( 'IDCInDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' )]
-    if (globalflags.DataSource() == "data"):
       ViewVerifyTrk_GSF.DataObjects += [( 'TRT_RDO_Container' , 'StoreGateSvc+%s' % TrigTRTKeys.RDOs )]
+    else:
+      ViewVerifyTrk_GSF.DataObjects += [( 'TRT_RDO_Container' , 'StoreGateSvc+%s' % "TRT_RDOs" )]
 
     """ Retrieve the factories now """
     from TriggerMenuMT.HLTMenuConfig.Electron.TrigElectronFactories import TrigEgammaRecElectron, TrigElectronSuperClusterBuilder, TrigTopoEgammaElectronCfg
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
index a90c2c55fff04ec01d85e9fb9b3e17dc9485adb9..5f7acd2492cb7637091856f7a91cc37c55501b67 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigEMBremCollectionBuilder.py
@@ -72,14 +72,14 @@ class TrigEgammaBremCollectionBuilder (egammaAlgsConf.EMBremCollectionBuilder):
 
             from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys
             from AthenaCommon.GlobalFlags import globalflags
-            TrigTRTRDOs = ""
+            TrigTRTRDOs = "TRT_RDOs"
             if globalflags.DataSource() == "data":
                 TrigTRTRDOs = TrigTRTKeys.RDOs
 
             TRT_LocalOccupancyTool = TrackingCommon.getInDetTRT_LocalOccupancy(
-                    TRT_RDOContainerName=TrigTRTRDOs,
-                    TRT_DriftCircleCollection=TrigTRTKeys.DriftCircles,
-                    isTrigger=True)
+                TRT_RDOContainerName=TrigTRTRDOs,
+                TRT_DriftCircleCollection="",
+                isTrigger=True)
 
             TRT_ToT_dEdx_Tool = TrackingCommon.getInDetTRT_dEdxTool(
                     TRT_LocalOccupancyTool=TRT_LocalOccupancyTool,