diff --git a/lib/Dialect/FIRRTL/Transforms/LowerClasses.cpp b/lib/Dialect/FIRRTL/Transforms/LowerClasses.cpp
index 57dff34221..3ffc5e4747 100644
--- a/lib/Dialect/FIRRTL/Transforms/LowerClasses.cpp
+++ b/lib/Dialect/FIRRTL/Transforms/LowerClasses.cpp
@@ -308,7 +308,8 @@ PathTracker::run(CircuitOp circuit, InstanceGraph &instanceGraph,
                           owningModules);
       if (failed(tracker.runOnModule()))
         return failure();
-      tracker.updatePathInfoTable(pathInfoTable, cache);
+      if (failed(tracker.updatePathInfoTable(pathInfoTable, cache)))
+        return failure();
     }
 
   return success();