diff --git a/algo/unpack/Unpack.cxx b/algo/unpack/Unpack.cxx
index f4cd2c884bd337101533ac2065231c97e5e60255..5ec97f975f96fbccac8757ff63ad195e816a036e 100644
--- a/algo/unpack/Unpack.cxx
+++ b/algo/unpack/Unpack.cxx
@@ -96,7 +96,10 @@ namespace cbm::algo
 
     // Get Unpacker
     const auto algoIt = algoMap.find(eqId);
-    assert(algoIt != algoMap.end());
+    if (algoIt == algoMap.end()) {
+      monitor.fNumErrInvalidEqId++;
+      return;
+    }
     UnpackAlgo& algo = algoIt->second;
 
     assert(timeslice->descriptor(comp, 0).sys_ver == sys_ver);
diff --git a/algo/unpack/Unpack.h b/algo/unpack/Unpack.h
index 72b10e66a5c3056ff67c793d9fabd512d134488c..afd0aeb169d9e2ae74b483b54f9272674878ff7e 100644
--- a/algo/unpack/Unpack.h
+++ b/algo/unpack/Unpack.h
@@ -48,6 +48,7 @@ namespace cbm::algo
     size_t fNumBytes    = 0;
     size_t fNumDigis    = 0;
     size_t fNumCompUsed = 0;
+    size_t fNumErrInvalidEqId = 0;
     std::string print()
     {
       std::stringstream ss;