diff --git a/.gitignore b/.gitignore
index 5734a2a4..1021ba1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,6 @@ __pycache__/
 
 /.mypy_cache/
 .skip-coverage
+
+.vscode/
+.idea/
diff --git a/src/fromager/bootstrapper.py b/src/fromager/bootstrapper.py
index 634d7a5d..ffdbf5c1 100644
--- a/src/fromager/bootstrapper.py
+++ b/src/fromager/bootstrapper.py
@@ -951,7 +951,6 @@ def _add_to_graph(
             download_url=download_url,
             pre_built=pbi.pre_built,
         )
-        self.ctx.write_to_graph_to_file()
 
     def _sort_requirements(
         self,
diff --git a/src/fromager/commands/bootstrap.py b/src/fromager/commands/bootstrap.py
index 3ff0bce1..ad164987 100644
--- a/src/fromager/commands/bootstrap.py
+++ b/src/fromager/commands/bootstrap.py
@@ -179,11 +179,15 @@ def bootstrap(
             )
             requirement_ctxvar.reset(token)
 
-        for req in to_build:
-            token = requirement_ctxvar.set(req)
-            bt.bootstrap(req, requirements_file.RequirementType.TOP_LEVEL)
-            progressbar.update()
-            requirement_ctxvar.reset(token)
+        try:
+            for req in to_build:
+                token = requirement_ctxvar.set(req)
+                bt.bootstrap(req, requirements_file.RequirementType.TOP_LEVEL)
+                progressbar.update()
+                requirement_ctxvar.reset(token)
+
+        finally:
+            wkctx.write_to_graph_to_file()
 
     constraints_filename = wkctx.work_dir / "constraints.txt"
     if skip_constraints: