diff --git a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx
index ef28079c8b1a665b763e8b1b5eea286ff6bac104..c575a29ba9543868f9f5f63a33a49583b4e50307 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx
+++ b/InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx
@@ -579,6 +579,10 @@ SCT_ByteStreamErrorsSvc::getRODOuts() const {
 }
 
 void SCT_ByteStreamErrorsSvc::setFirstTempMaskedChip(const IdentifierHash& hashId, const unsigned int firstTempMaskedChip) {
+  if(not hashId.is_valid()) {
+    ATH_MSG_INFO("setFirstTempMaskedChip hashId " << hashId << " is invalid.");
+    return;
+  }
   if(firstTempMaskedChip==0) {
     ATH_MSG_WARNING("setFirstTempMaskedChip: firstTempMaskedChip should be greater than 0. firstTempMaskedChip is " << firstTempMaskedChip);
     return;
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
index a848ac141fdbf998a49309dfb6435b3504c7579f..76ccb34f6355ee551de0f7442de6254dad200a9d 100755
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCT_RodDecoder.cxx
@@ -204,9 +204,9 @@ SCT_RodDecoder::fillCollection( const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*
 		   */
 
   /** These are for the trigger */
-  IdentifierHash skipHash=0xffffffff, lastHash=0xffffffff;
+  IdentifierHash skipHash, lastHash;
 
-  IdentifierHash currentLinkIdHash = 0xffffffff;
+  IdentifierHash currentLinkIdHash;
 
   memset(saved,0,768*2);
   m_errorHit->clear();
@@ -831,7 +831,7 @@ int SCT_RodDecoder::makeRDO(int strip, int groupSize,int tbin, uint32_t onlineId
   }
   /** get offlineId from the link number and ROB number */
   IdentifierHash idCollHash =  m_cabling->getHashFromOnlineId(onlineId) ;
-  if (idCollHash==0xffffffff) {
+  if (not idCollHash.is_valid()) {
     m_numUnknownOfflineId++;
     ATH_MSG_ERROR("Unknown OfflineId for OnlineId -> cannot create RDO");
     ATH_MSG_WARNING("Unknown OfflineId for OnlineId "<<std::hex<<onlineId <<" -> cannot create RDO"<<std::dec);