diff --git a/CHANGELOG.md b/CHANGELOG.md
index bab2337e..48efbb5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed a bug where interop deployment manager would in some cases fail because it tried to load unrelated items from the repo (#977)
-- Fixed bug causing compilation errors when first adding an IRIS Interoperability BPL or BR (#984)
+- Fixed bugs causing compilation errors when first adding an IRIS Interoperability BPL or BR (#984)
 
 ## [2.17.0] - 2026-06-22
 
diff --git a/cls/SourceControl/Git/Extension.cls b/cls/SourceControl/Git/Extension.cls
index a97dc07e..4b65659b 100644
--- a/cls/SourceControl/Git/Extension.cls
+++ b/cls/SourceControl/Git/Extension.cls
@@ -461,12 +461,15 @@ Method OnAfterDelete(InternalName As %String) As %Status
 /// change in the class. The <var>Location</var> is the global reference to the class definition that was changed.
 Method OnAfterStorage(InternalName As %String, Location As %String = "") As %Status
 {
+    $$$SuspendErrorCount
     if (InternalName '= "") {
         write !,"Item '"_InternalName_"' changed during compile so exporting new version."
         set ..Modified(InternalName) = 1
         set sc = ..OnAfterSave(InternalName)
         if $$$ISERR(sc) {
             do $System.OBJ.DisplayError(sc)
+            do $System.Status.DecomposeStatus(sc, .errorlog)
+            $$$IncErrorNums(errorlog)
         }
     }
     return $$$OK