diff --git a/Event/FaserByteStreamCnvSvc/src/FaserByteStreamInputSvc.cxx b/Event/FaserByteStreamCnvSvc/src/FaserByteStreamInputSvc.cxx
index 64e263a8bb64ad5730e1a53358e63631d0d2d67d..8695ec12b9233fff232a3759e78891d8f8caeb90 100644
--- a/Event/FaserByteStreamCnvSvc/src/FaserByteStreamInputSvc.cxx
+++ b/Event/FaserByteStreamCnvSvc/src/FaserByteStreamInputSvc.cxx
@@ -57,7 +57,7 @@ FaserByteStreamInputSvc::FaserByteStreamInputSvc(
   , m_eventInfoKey (this, "EventInfoKey", "EventInfo", "Key of EventInfo in metadata store")
 
 {
-  assert(pSvcLocator != nullptr);
+  assert(svcloc != nullptr);
 
   declareProperty("EventStore",    m_storeGate);
   //declareProperty("MetaDataStore", m_inputMetadata);
diff --git a/Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FillFromStringUtility.h b/Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FillFromStringUtility.h
index 6e445fcc875e87dde1b298f5d1f2f5fa4bc3b387..5fb67fa0a0383231aa13b97a385fbe08865cc175 100644
--- a/Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FillFromStringUtility.h
+++ b/Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FillFromStringUtility.h
@@ -28,6 +28,8 @@ namespace {
     const Tokenizer::iterator end{tok.end()};
     int j{0};
     for (Tokenizer::iterator i{tok.begin()}; i!=end; ++i) {
+      if (j == userContainer.size())
+        break;
       try {
         userContainer[j]=boost::lexical_cast<V_t>(*i);
       } catch (const boost::bad_lexical_cast&) {