diff --git a/include/verilated_saif_c.cpp b/include/verilated_saif_c.cpp
index 38c553847..a3522043f 100644
--- a/include/verilated_saif_c.cpp
+++ b/include/verilated_saif_c.cpp
@@ -507,7 +507,7 @@ void VerilatedSaifActivityAccumulator::declare(uint32_t code, const std::string&
 void VerilatedSaif::declare(const uint32_t code, uint32_t fidx, const char* name,
                             const char* wirep, const bool array, const int arraynum,
                             const bool bussed, const int msb, const int lsb) {
-
+    assert(m_activityAccumulators.size() > fidx);
     VerilatedSaifActivityAccumulator& accumulator = *m_activityAccumulators.at(fidx);
 
     const int bits = ((msb > lsb) ? (msb - lsb) : (lsb - msb)) + 1;
diff --git a/include/verilated_saif_c.h b/include/verilated_saif_c.h
index aefe38d0b..8bf46cda0 100644
--- a/include/verilated_saif_c.h
+++ b/include/verilated_saif_c.h
@@ -192,7 +192,7 @@ class VerilatedSaifBuffer VL_NOT_FINAL {
     VerilatedSaif& m_owner;  // Trace file owning this buffer. Required by subclasses.
     uint32_t m_fidx;  // Index of target activity accumulator
 
-    // CONSTRUCTOR
+    // CONSTRUCTORS
     explicit VerilatedSaifBuffer(VerilatedSaif& owner)
         : m_owner{owner}
         , m_fidx{0} {}