diff --git a/libs/scir/src/lib.rs b/libs/scir/src/lib.rs
index 572bee78..2e7f7a02 100644
--- a/libs/scir/src/lib.rs
+++ b/libs/scir/src/lib.rs
@@ -1136,8 +1136,7 @@ impl<S: Schema + ?Sized> LibraryBuilder<S> {
                                         top_id?
                                     } else {
                                         path.instances[i - 1].child.unwrap().unwrap_cell()
-                                    })
-                                    .unwrap()
+                                    })?
                                     .instances
                                     .get(id)?
                                     .clone(),