diff --git a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
index 06233836b5018ea42ce1a54734980a17250c3972..25c1f00978abd23dd135ccf39fb610ecdb8fbc67 100644
--- a/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/MM_Digitization/src/MM_DigitizationTool.cxx
@@ -1242,6 +1242,10 @@ StatusCode MM_DigitizationTool::doDigitization(const EventContext& ctx) {
     // IdentifierHash detIdhash ;
     // set RE hash id
     const Identifier elemId = m_idHelperSvc->mmIdHelper().elementID( stripDigitOutputAllHits.digitID() );
+    if (!m_idHelperSvc->isMM(elemId)) {
+        ATH_MSG_WARNING("given Identifier "<<elemId.get_compact()<<" is not a MM Identifier, skipping");
+        continue;
+    }
     m_idHelperSvc->mmIdHelper().get_module_hash( elemId, moduleHash );
     
     MmDigitCollection* digitCollection = nullptr;
diff --git a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx
index 9f17409e5b8579d3e965b928d9a4766aaa55d3d5..d622c58f0b7c35420c3131bb74f534da59512f95 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx
+++ b/MuonSpectrometer/MuonReconstruction/MuonPatternFinders/MuonPatternFinderTools/MuonHoughPatternTools/src/MuonLayerHoughTool.cxx
@@ -900,7 +900,7 @@ namespace Muon {
               }
             }
           }else if( etaHit.prd ){
-            if( !m_idHelperSvc->isRpc(etaHit.prd->identify()) ) continue;
+            if( !m_idHelperSvc->isRpc(etaHit.prd->identify()) && !m_idHelperSvc->issTgc(etaHit.prd->identify())) continue;
             Identifier gpId = m_idHelperSvc->gasGapId( etaHit.prd->identify() );
             auto mit = triggerLayersPhiMinMax.find(gpId);
             if( mit == triggerLayersPhiMinMax.end() )  ++nNoOverlaps;