diff --git a/calibration/python/build_cal_frames.py b/calibration/python/build_cal_frames.py
index 7a816f83..49ff2d0e 100644
--- a/calibration/python/build_cal_frames.py
+++ b/calibration/python/build_cal_frames.py
@@ -355,6 +355,11 @@ def __call__(self, frame):
                     self.outframe[k] = frame[k]
             return []
 
+        # Allow extra calibration frames to follow proper calframe files
+        # (which likely have PipelineInfo frames in them)
+        if frame.type == core.G3FrameType.PipelineInfo:
+            return
+
         # Ignore random wiring frames etc.
         if self.outframe is None or len(self.outframe.keys()) == 0:
             return