diff --git a/etc/FindMessages.tcl b/etc/FindMessages.tcl
index 24dcc3ad..bf60754b 100755
--- a/etc/FindMessages.tcl
+++ b/etc/FindMessages.tcl
@@ -61,7 +61,7 @@ foreach subdir $subdirs {
     set files [glob -nocomplain [file join $subdir "*.{cc,hh,yy,ll,i}"]]
     set files_c [concat $files_c $files]
 }
-set warn_regexp_c {(?:(?:criticalError|->warn|->fileWarn|->error|->fileError|libWarn|libError| warn)\(|tclArgError\(interp,\s*)([0-9]+),.*(".+")}
+set warn_regexp_c {(?:(?:->critical|->warn|->fileWarn|->error|->fileError|libWarn|libError| warn)\(|tclArgError\(interp,\s*)([0-9]+),.*(".+")}
 
 set files_tcl {}
 foreach subdir $subdirs {
diff --git a/search/Sta.cc b/search/Sta.cc
index 8028a716..c9e632cf 100644
--- a/search/Sta.cc
+++ b/search/Sta.cc
@@ -4240,7 +4240,7 @@ Sta::replaceEquivCellBefore(const Instance *inst,
               if (to_set)
                 edge->setTimingArcSet(to_set);
               else
-                report_->critical(1553, "corresponding timing arc set not found in equiv cells");
+                report_->critical(1555, "corresponding timing arc set not found in equiv cells");
             }
           }
         }