diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ef9c32..2a349f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Handling nulls in line series
+
 ## [0.3.0] - 2026-02-19
 
 ### Changed
diff --git a/examples/bitcoin.rs b/examples/bitcoin.rs
index a1b08f2..368ddc5 100644
--- a/examples/bitcoin.rs
+++ b/examples/bitcoin.rs
@@ -3,7 +3,6 @@ use plotive::{data, des};
 mod common;
 
 fn main() {
-    // FIXME: support parsing datetime in CSV
     let btc_csv = common::example_res("BTC-USD.csv");
     let csv_data = std::fs::read_to_string(&btc_csv).unwrap();
     let data_source = data::csv::parse_str(&csv_data, Default::default()).unwrap();
diff --git a/src/data.rs b/src/data.rs
index 90d4c9f..c4c6d41 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -43,7 +43,11 @@ pub enum SampleRef<'a> {
 impl SampleRef<'_> {
     /// Check if the sample is null
     pub fn is_null(&self) -> bool {
-        matches!(self, SampleRef::Null)
+        match self {
+            SampleRef::Null => true,
+            SampleRef::Num(v) => !v.is_finite(),
+            _ => false,
+        }
     }
 
     /// Get the sample as a numeric value, if possible
@@ -200,7 +204,11 @@ pub enum Sample {
 impl Sample {
     /// Check if the sample is null
     pub fn is_null(&self) -> bool {
-        matches!(self, Sample::Null)
+        match self {
+            Sample::Null => true,
+            Sample::Num(v) => !v.is_finite(),
+            _ => false,
+        }
     }
 
     /// Get the sample as a numeric value, if possible
diff --git a/src/drawing/series.rs b/src/drawing/series.rs
index 75e76e5..98e6a9b 100644
--- a/src/drawing/series.rs
+++ b/src/drawing/series.rs
@@ -290,6 +290,196 @@ struct Line {
     interpolation: des::series::Interpolation,
 }
 
+trait Liner {
+    fn new(pt_len: usize) -> Self
+    where
+        Self: Sized;
+
+    fn start_line(&mut self, x: f32, y: f32);
+    fn cont_line(&mut self, x: f32, y: f32);
+    fn stop_line(&mut self, x: f32, y: f32) {
+        self.cont_line(x, y);
+    }
+
+    fn into_path(self) -> geom::Path;
+}
+
+struct LinearLiner {
+    pb: geom::PathBuilder,
+}
+
+impl Liner for LinearLiner {
+    fn new(pt_len: usize) -> Self {
+        LinearLiner {
+            pb: geom::PathBuilder::with_capacity(pt_len + 1, pt_len),
+        }
+    }
+
+    fn start_line(&mut self, x: f32, y: f32) {
+        self.pb.move_to(x, y);
+    }
+
+    fn cont_line(&mut self, x: f32, y: f32) {
+        self.pb.line_to(x, y);
+    }
+
+    fn into_path(self) -> geom::Path {
+        self.pb.finish().expect("Should be a valid path")
+    }
+}
+
+struct StepLiner {
+    pb: geom::PathBuilder,
+    prev_x: Option<f32>,
+    prev_y: Option<f32>,
+    step_type: des::series::Interpolation,
+}
+
+impl Liner for StepLiner {
+    fn new(_pt_len: usize) -> Self {
+        StepLiner {
+            pb: geom::PathBuilder::new(),
+            prev_x: None,
+            prev_y: None,
+            step_type: des::series::Interpolation::StepEarly, // default, will be set properly in prepare
+        }
+    }
+
+    fn into_path(self) -> geom::Path {
+        self.pb.finish().expect("Should be a valid path")
+    }
+
+    fn start_line(&mut self, x: f32, y: f32) {
+        self.prev_x = Some(x);
+        self.prev_y = Some(y);
+        self.pb.move_to(x, y);
+    }
+
+    fn cont_line(&mut self, x: f32, y: f32) {
+        if let (Some(px), Some(py)) = (self.prev_x, self.prev_y) {
+            match self.step_type {
+                des::series::Interpolation::StepEarly => {
+                    self.pb.line_to(px, y);
+                    self.pb.line_to(x, y);
+                }
+                des::series::Interpolation::StepLate => {
+                    self.pb.line_to(x, py);
+                    self.pb.line_to(x, y);
+                }
+                des::series::Interpolation::StepMiddle => {
+                    let mid_x = (px + x) / 2.0;
+                    self.pb.line_to(mid_x, py);
+                    self.pb.line_to(mid_x, y);
+                    self.pb.line_to(x, y);
+                }
+                _ => {}
+            }
+        } else {
+            self.pb.move_to(x, y);
+        }
+        self.prev_x = Some(x);
+        self.prev_y = Some(y);
+    }
+}
+
+struct CubicSplineLiner {
+    pb: geom::PathBuilder,
+    buf: [(f32, f32); 4],
+    buf_idx: usize,
+}
+
+impl CubicSplineLiner {
+    fn add_point(&mut self, points: &[(f32, f32)]) {
+        match points.len() {
+            2 => {
+                self.pb.line_to(points[1].0, points[1].1);
+            }
+            3 => {
+                unreachable!()
+                // // For the first segment, we can use a quadratic Bezier with control point at p1
+                // let cp_x = points[1].0;
+                // let cp_y = points[1].1;
+                // self.pb
+                //     .quad_to(cp_x, cp_y, points[2].0, points[2].1);
+            }
+            4 => {
+                // Calculate control points for cubic Bezier using Catmull-Rom formulation
+                // The tangent at p1 is (p2 - p0) / 2
+                // The tangent at p2 is (p3 - p1) / 2
+
+                // Tension parameter (0.5 for standard Catmull-Rom)
+                let tension = 0.5;
+
+                // Control point 1: p1 + tangent_at_p1 / 3
+                let tangent1_x = (points[2].0 - points[0].0) * tension;
+                let tangent1_y = (points[2].1 - points[0].1) * tension;
+                let cp1_x = points[1].0 + tangent1_x / 3.0;
+                let cp1_y = points[1].1 + tangent1_y / 3.0;
+
+                // Control point 2: p2 - tangent_at_p2 / 3
+                let tangent2_x = (points[3].0 - points[1].0) * tension;
+                let tangent2_y = (points[3].1 - points[1].1) * tension;
+                let cp2_x = points[2].0 - tangent2_x / 3.0;
+                let cp2_y = points[2].1 - tangent2_y / 3.0;
+
+                // Draw cubic Bezier curve
+                self.pb
+                    .cubic_to(cp1_x, cp1_y, cp2_x, cp2_y, points[2].0, points[2].1);
+            }
+            _ => {}
+        }
+    }
+}
+
+impl Liner for CubicSplineLiner {
+    fn new(_pt_len: usize) -> Self {
+        CubicSplineLiner {
+            pb: geom::PathBuilder::new(),
+            buf: [(0.0, 0.0); 4],
+            buf_idx: 0,
+        }
+    }
+
+    fn into_path(self) -> geom::Path {
+        self.pb.finish().expect("Should be a valid path")
+    }
+
+    fn start_line(&mut self, x: f32, y: f32) {
+        self.buf[0] = (x, y);
+        self.buf_idx = 1;
+        self.pb.move_to(x, y);
+    }
+
+    fn cont_line(&mut self, x: f32, y: f32) {
+        self.buf[self.buf_idx] = (x, y);
+        self.buf_idx += 1;
+        if self.buf_idx == 3 {
+            // For the first segment, we can use a quadratic Bezier with control point at p1
+            let [(x0, y0), (x1, y1), (x2, y2), _] = self.buf;
+            let points = [(x0, y0), (x0, y0), (x1, y1), (x2, y2)];
+            self.add_point(&points);
+        } else if self.buf_idx == 4 {
+            let points = self.buf;
+            self.add_point(&points);
+            // Shift buffer
+            self.buf[0] = self.buf[1];
+            self.buf[1] = self.buf[2];
+            self.buf[2] = self.buf[3];
+            self.buf_idx = 3;
+        }
+    }
+
+    fn stop_line(&mut self, x: f32, y: f32) {
+        self.cont_line(x, y);
+
+        // we draw the last segment if any
+        if self.buf_idx == 3 {
+            let points = [self.buf[0], self.buf[1], self.buf[2], self.buf[2]];
+            self.add_point(&points);
+        }
+    }
+}
+
 impl Line {
     fn prepare<D>(index: usize, des: &des::series::Line, data_source: &D) -> Result<Self, Error>
     where
@@ -319,230 +509,79 @@ impl Line {
         debug_assert!(x_col.len() == y_col.len());
 
         let path = match self.interpolation {
-            des::series::Interpolation::Linear => self.make_path_linear(rect, x_col, y_col, cm),
-            des::series::Interpolation::StepEarly => {
-                self.make_path_step_early(rect, x_col, y_col, cm)
-            }
-            des::series::Interpolation::StepLate => {
-                self.make_path_step_late(rect, x_col, y_col, cm)
+            des::series::Interpolation::Linear => {
+                let mut liner = LinearLiner::new(x_col.len());
+                self.make_line_path(rect, x_col, y_col, cm, &mut liner);
+                liner.into_path()
             }
-            des::series::Interpolation::StepMiddle => {
-                self.make_path_step_middle(rect, x_col, y_col, cm)
+            des::series::Interpolation::StepEarly
+            | des::series::Interpolation::StepLate
+            | des::series::Interpolation::StepMiddle => {
+                let mut liner = StepLiner::new(x_col.len());
+                liner.step_type = self.interpolation;
+                self.make_line_path(rect, x_col, y_col, cm, &mut liner);
+                liner.into_path()
             }
             des::series::Interpolation::Spline => {
-                self.make_path_cubic_spline(rect, x_col, y_col, cm)
+                let mut liner = CubicSplineLiner::new(x_col.len());
+                self.make_line_path(rect, x_col, y_col, cm, &mut liner);
+                liner.into_path()
             }
         };
 
         self.path = Some(path);
     }
 
-    fn make_path_linear(
-        &self,
-        rect: &geom::Rect,
-        x: &dyn data::Column,
-        y: &dyn data::Column,
-        cm: &CoordMapXy,
-    ) -> geom::Path {
-        let mut in_a_line = false;
-        let mut pb = geom::PathBuilder::with_capacity(x.len() + 1, x.len());
-        for (x, y) in x.sample_iter().zip(y.sample_iter()) {
-            if x.is_null() || y.is_null() {
-                in_a_line = false;
-                continue;
-            }
-            let (x, y) = cm.map_coord((x, y)).expect("Should be valid coordinates");
-            let x = rect.left() + x;
-            let y = rect.bottom() - y;
-            // if x_col.len() == 1024 {
-            //     println!("  adding point {} {}", x, y);
-            // }
-            if in_a_line {
-                pb.line_to(x, y);
-            } else {
-                pb.move_to(x, y);
-                in_a_line = true;
-            }
-        }
-        pb.finish().expect("Should be a valid path")
-    }
-
-    fn make_path_step_early(
+    fn make_line_path<L>(
         &self,
         rect: &geom::Rect,
         x: &dyn data::Column,
         y: &dyn data::Column,
         cm: &CoordMapXy,
-    ) -> geom::Path {
-        let mut pb = geom::PathBuilder::new();
-
-        let mut prev_x: Option<f32> = None;
-
-        for (x, y) in x.sample_iter().zip(y.sample_iter()) {
-            if x.is_null() || y.is_null() {
-                prev_x = None;
-                continue;
-            }
-            let (x, y) = cm.map_coord((x, y)).expect("Should be valid coordinates");
-            let (x, y) = plot_to_fig(rect, x, y);
-
-            if let Some(px) = prev_x {
-                pb.line_to(px, y);
-                pb.line_to(x, y);
-            } else {
-                pb.move_to(x, y);
-            }
-            prev_x = Some(x);
-        }
-
-        pb.finish().expect("Should be a valid path")
-    }
-
-    fn make_path_step_late(
-        &self,
-        rect: &geom::Rect,
-        x: &dyn data::Column,
-        y: &dyn data::Column,
-        cm: &CoordMapXy,
-    ) -> geom::Path {
-        let mut pb = geom::PathBuilder::new();
-
-        let mut prev_y: Option<f32> = None;
-
-        for (x, y) in x.sample_iter().zip(y.sample_iter()) {
-            if x.is_null() || y.is_null() {
-                prev_y = None;
-                continue;
-            }
-            let (x, y) = cm.map_coord((x, y)).expect("Should be valid coordinates");
-            let (x, y) = plot_to_fig(rect, x, y);
-
-            if let Some(py) = prev_y {
-                pb.line_to(x, py);
-                pb.line_to(x, y);
-            } else {
-                pb.move_to(x, y);
-            }
-            prev_y = Some(y);
-        }
-
-        pb.finish().expect("Should be a valid path")
-    }
-
-    fn make_path_step_middle(
-        &self,
-        rect: &geom::Rect,
-        x: &dyn data::Column,
-        y: &dyn data::Column,
-        cm: &CoordMapXy,
-    ) -> geom::Path {
-        let mut pb = geom::PathBuilder::new();
-
-        let mut prev_x: Option<f32> = None;
-        let mut prev_y: Option<f32> = None;
+        liner: &mut L,
+    ) where
+        L: Liner,
+    {
+        let mut prev = None;
+        let mut cur = None;
 
         for (x, y) in x.sample_iter().zip(y.sample_iter()) {
-            if x.is_null() || y.is_null() {
-                prev_x = None;
-                prev_y = None;
-                continue;
-            }
-            let (x, y) = cm.map_coord((x, y)).expect("Should be valid coordinates");
-            let (x, y) = plot_to_fig(rect, x, y);
-
-            if let (Some(px), Some(py)) = (prev_x, prev_y) {
-                let mx = (px + x) / 2.0;
-                pb.line_to(mx, py);
-                pb.line_to(mx, y);
-                pb.line_to(x, y);
+            let next = if x.is_null() || y.is_null() {
+                None
             } else {
-                pb.move_to(x, y);
-            }
-            prev_x = Some(x);
-            prev_y = Some(y);
-        }
-
-        pb.finish().expect("Should be a valid path")
-    }
-
-    fn make_path_cubic_spline(
-        &self,
-        rect: &geom::Rect,
-        x: &dyn data::Column,
-        y: &dyn data::Column,
-        cm: &CoordMapXy,
-    ) -> geom::Path {
-        const NAN: (f32, f32) = (f32::NAN, f32::NAN);
-        let mut buf: [(f32, f32); 4] = [NAN, NAN, NAN, NAN];
-        let mut buf_idx = 0;
-
-        let mut pb = geom::PathBuilder::new();
-
-        fn add_point(pb: &mut geom::PathBuilder, points: &[(f32, f32); 4]) {
-            // Calculate control points for cubic Bezier using Catmull-Rom formulation
-            // The tangent at p1 is (p2 - p0) / 2
-            // The tangent at p2 is (p3 - p1) / 2
-
-            // Tension parameter (0.5 for standard Catmull-Rom)
-            let tension = 0.5;
-
-            // Control point 1: p1 + tangent_at_p1 / 3
-            let tangent1_x = (points[2].0 - points[0].0) * tension;
-            let tangent1_y = (points[2].1 - points[0].1) * tension;
-            let cp1_x = points[1].0 + tangent1_x / 3.0;
-            let cp1_y = points[1].1 + tangent1_y / 3.0;
-
-            // Control point 2: p2 - tangent_at_p2 / 3
-            let tangent2_x = (points[3].0 - points[1].0) * tension;
-            let tangent2_y = (points[3].1 - points[1].1) * tension;
-            let cp2_x = points[2].0 - tangent2_x / 3.0;
-            let cp2_y = points[2].1 - tangent2_y / 3.0;
-
-            // Draw cubic Bezier curve
-            pb.cubic_to(cp1_x, cp1_y, cp2_x, cp2_y, points[2].0, points[2].1);
-        }
+                let (x, y) = cm.map_coord((x, y)).expect("Should be valid coordinates");
+                let (x, y) = plot_to_fig(rect, x, y);
+                Some((x, y))
+            };
 
-        for (x, y) in x.sample_iter().zip(y.sample_iter()) {
-            if x.is_null() || y.is_null() {
-                if buf_idx == 3 {
-                    // we draw the last segment if any
-                    add_point(&mut pb, &[buf[0], buf[1], buf[2], buf[2]]);
+            match (prev, cur, next) {
+                (_, None, _) => {}
+                (None, Some(_), None) => {
+                    // single point, no line to draw
+                }
+                (None, Some((x, y)), Some(_)) => {
+                    liner.start_line(x, y);
+                }
+                (Some(_), Some((x, y)), None) => {
+                    liner.stop_line(x, y);
+                }
+                (Some(_), Some((x, y)), Some(_)) => {
+                    liner.cont_line(x, y);
                 }
-                buf_idx = 0;
-                continue;
             }
-            let (x, y) = cm.map_coord((x, y)).expect("Should be valid coordinates");
-            let (x, y) = plot_to_fig(rect, x, y);
+            prev = cur;
+            cur = next;
+        }
 
-            // first point, or after a gap
-            if buf_idx == 0 {
-                pb.move_to(x, y);
+        match (prev, cur) {
+            (_, None) => {}
+            (None, Some(_)) => {
+                // single point, no line to draw
             }
-
-            buf[buf_idx] = (x, y);
-            buf_idx += 1;
-
-            if buf_idx == 3 {
-                // we draw the first segment
-                add_point(&mut pb, &[buf[0], buf[0], buf[1], buf[2]]);
-            } else if buf_idx == 4 {
-                // we draw a regular segment
-                add_point(&mut pb, &buf);
-
-                // Shift buffer
-                buf[0] = buf[1];
-                buf[1] = buf[2];
-                buf[2] = buf[3];
-                buf_idx = 3;
+            (Some(_), Some((x, y))) => {
+                liner.stop_line(x, y);
             }
         }
-
-        // we draw the last segment if any
-        if buf_idx == 3 {
-            add_point(&mut pb, &[buf[0], buf[1], buf[2], buf[2]]);
-        }
-
-        pb.finish().expect("Should be a valid path")
     }
 
     fn draw<S>(&self, surface: &mut S, style: &Style)
diff --git a/tests/refs/nulls/line-lin-null-end.png b/tests/refs/nulls/line-lin-null-end.png
new file mode 100644
index 0000000..00cc003
Binary files /dev/null and b/tests/refs/nulls/line-lin-null-end.png differ
diff --git a/tests/refs/nulls/line-lin-null-end.svg b/tests/refs/nulls/line-lin-null-end.svg
new file mode 100644
index 0000000..f7aa21e
--- /dev/null
+++ b/tests/refs/nulls/line-lin-null-end.svg
@@ -0,0 +1,11 @@
+<svg height="300" viewBox="0 0 400 300" width="400" xmlns="http://www.w3.org/2000/svg">
+<rect fill="#ffffff" height="100%" width="100%"/>
+<clipPath id="plotive-clip1">
+<rect height="230.20801" width="360" x="20" y="20"/>
+</clipPath>
+<g clip-path="url(#plotive-clip1)">
+<path d="M40,230.20801 L120.00001,166.80533 L200,103.402664 L280,40" fill="none" stroke="#000000" stroke-width="1.5"/>
+</g>
+<path d="M-17.536001,12.719999 L-20.496002,8.528 L-18.896002,8.528 L-16.688002,11.76 L-14.496001,8.528 L-12.912001,8.528 L-15.872002,12.719999 L-12.752001,17.104 L-14.352001,17.104 L-16.688002,13.68 L-19.056002,17.104 L-20.640001,17.104 L-17.536001,12.719999 z M-3.6960006,8.384 Q-2.1280007,8.384,-1.3760004,9.072 Q-0.62400055,9.76,-0.62400055,11.264 L-0.62400055,17.104 L-1.6480007,17.104 L-1.9200006,15.8880005 L-1.9840007,15.8880005 Q-2.3520007,16.352,-2.7440004,16.664 Q-3.1360006,16.976,-3.6400008,17.12 Q-4.1440005,17.264,-4.864001,17.264 Q-5.632001,17.264,-6.248001,16.992 Q-6.864001,16.72,-7.2160006,16.152 Q-7.568001,15.584,-7.568001,14.72 Q-7.568001,13.44,-6.560001,12.7439995 Q-5.552001,12.048,-3.4560008,11.983999 L-2.0000005,11.936 L-2.0000005,11.424 Q-2.0000005,10.351999,-2.4640007,9.936 Q-2.9280005,9.5199995,-3.7760005,9.5199995 Q-4.448001,9.5199995,-5.0560007,9.719999 Q-5.6640005,9.92,-6.192001,10.176 L-6.6240005,9.12 Q-6.064001,8.816,-5.2960005,8.599999 Q-4.528001,8.384,-3.6960006,8.384 z M-3.2800007,12.96 Q-4.8800006,13.024,-5.496001,13.472 Q-6.1120005,13.92,-6.1120005,14.736 Q-6.1120005,15.456,-5.672001,15.792 Q-5.232001,16.128,-4.5440006,16.128 Q-3.4560008,16.128,-2.7360005,15.528 Q-2.0160007,14.9279995,-2.0160007,13.68 L-2.0160007,12.912 L-3.2800007,12.96 z M4.064,12.719999 L1.104,8.528 L2.704,8.528 L4.912,11.76 L7.104,8.528 L8.688001,8.528 L5.728,12.719999 L8.848001,17.104 L7.248,17.104 L4.912,13.68 L2.5440001,17.104 L0.9599999,17.104 L4.064,12.719999 z M11.904001,8.528 L11.904001,17.104 L10.496,17.104 L10.496,8.528 L11.904001,8.528 z M11.216001,5.3119993 Q11.536001,5.3119993,11.784,5.528 Q12.032001,5.7439995,12.032001,6.207999 Q12.032001,6.655999,11.784,6.879999 Q11.536001,7.104,11.216001,7.104 Q10.864,7.104,10.624001,6.879999 Q10.384001,6.655999,10.384001,6.207999 Q10.384001,5.7439995,10.624001,5.528 Q10.864,5.3119993,11.216001,5.3119993 z M20.208,14.736 Q20.208,15.568,19.792002,16.128 Q19.376001,16.688,18.608002,16.976 Q17.84,17.264,16.784,17.264 Q15.8880005,17.264,15.240001,17.12 Q14.592001,16.976,14.096001,16.72 L14.096001,15.440001 Q14.608001,15.696,15.336,15.912 Q16.064001,16.128,16.816002,16.128 Q17.888,16.128,18.368,15.784 Q18.848001,15.440001,18.848001,14.864 Q18.848001,14.544,18.672,14.288 Q18.496002,14.032,18.04,13.776 Q17.584002,13.52,16.736,13.2 Q15.904001,12.88,15.312001,12.559999 Q14.720001,12.24,14.400001,11.792 Q14.080001,11.344,14.080001,10.639999 Q14.080001,9.552,14.968001,8.96 Q15.856001,8.368,17.296001,8.368 Q18.080002,8.368,18.760002,8.5199995 Q19.44,8.672,20.032001,8.943999 L19.552002,10.063999 Q19.008001,9.84,18.416,9.68 Q17.824001,9.5199995,17.2,9.5199995 Q16.336,9.5199995,15.880001,9.799999 Q15.424001,10.08,15.424001,10.559999 Q15.424001,10.912,15.632001,11.16 Q15.840001,11.408,16.328001,11.639999 Q16.816002,11.872,17.632,12.191999 Q18.448002,12.496,19.024002,12.816 Q19.600002,13.136,19.904001,13.592 Q20.208,14.048,20.208,14.736 z" fill="#000000" stroke="none" transform="matrix(1 0 0 1 200 258.208)"/>
+<rect fill="none" height="230.20801" stroke="#000000" stroke-width="1" width="360" x="20" y="20"/>
+</svg>
\ No newline at end of file
diff --git a/tests/refs/nulls/line-spline-null-middle.png b/tests/refs/nulls/line-spline-null-middle.png
new file mode 100644
index 0000000..56defe2
Binary files /dev/null and b/tests/refs/nulls/line-spline-null-middle.png differ
diff --git a/tests/refs/nulls/line-spline-null-middle.svg b/tests/refs/nulls/line-spline-null-middle.svg
new file mode 100644
index 0000000..6a4b7b1
--- /dev/null
+++ b/tests/refs/nulls/line-spline-null-middle.svg
@@ -0,0 +1,16 @@
+<svg height="300" viewBox="0 0 400 300" width="400" xmlns="http://www.w3.org/2000/svg">
+<rect fill="#ffffff" height="100%" width="100%"/>
+<clipPath id="plotive-clip1">
+<rect height="235.656" width="360" x="20" y="20"/>
+</clipPath>
+<g clip-path="url(#plotive-clip1)">
+<path d="M40,235.656 C45.925926,219.35133,63.703705,162.285,75.55556,137.828 C87.40741,113.371,99.259254,80.761665,111.11111,88.914 C122.96296,97.06634,134.8148,194.89433,146.66666,186.742 C158.51851,178.58968,176.2963,64.457,182.22223,40 M253.33333,137.828 C259.25925,129.67567,277.03705,80.761665,288.8889,88.914 C300.74072,97.06634,312.5926,194.89433,324.44443,186.742 C336.29626,178.58968,354.07407,64.457,360,40" fill="none" stroke="#000000" stroke-width="1.5"/>
+</g>
+<path d="M55.555553,-4 L55.555553,4 M126.666664,-4 L126.666664,4 M197.77777,-4 L197.77777,4 M268.8889,-4 L268.8889,4 M340,-4 L340,4" fill="none" stroke="#000000" stroke-width="1" transform="matrix(1 0 0 1 20 255.656)"/>
+<path d="M-2.2319999,12.828 L-7.896,12.828 L-7.896,11.952 L-5.6520004,9.684 Q-5.004,9.036,-4.5600004,8.532 Q-4.116,8.028,-3.888,7.542 Q-3.6599998,7.056,-3.6599998,6.48 Q-3.6599998,5.772,-4.08,5.406 Q-4.5,5.04,-5.172,5.04 Q-5.796,5.04,-6.2700005,5.256 Q-6.744,5.472,-7.236,5.856 L-7.8,5.148 Q-7.464,4.86,-7.0620003,4.632 Q-6.66,4.4040003,-6.186,4.2720003 Q-5.712,4.1400003,-5.172,4.1400003 Q-4.368,4.1400003,-3.7920003,4.4160004 Q-3.216,4.6920004,-2.8980002,5.202 Q-2.58,5.712,-2.58,6.42 Q-2.58,7.092,-2.856,7.68 Q-3.132,8.268,-3.624,8.838 Q-4.116,9.408,-4.776,10.056 L-6.564,11.82 L-6.564,11.868 L-2.2319999,11.868 L-2.2319999,12.828 z M-0.74400026,12.18 Q-0.74400026,11.736,-0.52800024,11.556 Q-0.31200027,11.376,-0.012000322,11.376 Q0.2999997,11.376,0.52199984,11.556 Q0.7439997,11.736,0.7439997,12.18 Q0.7439997,12.612,0.52199984,12.804 Q0.2999997,12.996,-0.012000322,12.996 Q-0.31200027,12.996,-0.52800024,12.804 Q-0.74400026,12.612,-0.74400026,12.18 z M7.884,8.532 Q7.884,9.576,7.7279997,10.392 Q7.572,11.208,7.23,11.778 Q6.888,12.348,6.342,12.648 Q5.796,12.948,5.028,12.948 Q4.068,12.948,3.4379997,12.42 Q2.8079998,11.892,2.5019999,10.902 Q2.1959999,9.912,2.1959999,8.532 Q2.1959999,7.14,2.4779997,6.156 Q2.7599998,5.172,3.3839998,4.6499996 Q4.008,4.1280003,5.028,4.1280003 Q5.988,4.1280003,6.624,4.6499996 Q7.2599998,5.172,7.572,6.156 Q7.884,7.14,7.884,8.532 z M3.2519999,8.532 Q3.2519999,9.708,3.4259996,10.488 Q3.6,11.268,3.9899998,11.658 Q4.38,12.048,5.028,12.048 Q5.6759996,12.048,6.066,11.664 Q6.456,11.28,6.6359997,10.4939995 Q6.816,9.708,6.816,8.532 Q6.816,7.356,6.6359997,6.582 Q6.456,5.808,6.066,5.418 Q5.6759996,5.028,5.028,5.028 Q4.38,5.028,3.9899998,5.418 Q3.6,5.808,3.4259996,6.582 Q3.2519999,7.356,3.2519999,8.532 z" fill="#000000" stroke="none" transform="matrix(1 0 0 1 75.55556 263.656)"/>
+<path d="M-1.848,10.884 L-3.0960002,10.884 L-3.0960002,12.828 L-4.116,12.828 L-4.116,10.884 L-8.22,10.884 L-8.22,9.984 L-4.188,4.212 L-3.0960002,4.212 L-3.0960002,9.936 L-1.848,9.936 L-1.848,10.884 z M-4.116,7.236 Q-4.116,6.924,-4.11,6.666 Q-4.104,6.408,-4.092,6.18 Q-4.08,5.952,-4.074,5.742 Q-4.0680003,5.532,-4.056,5.34 L-4.104,5.34 Q-4.2000003,5.568,-4.344,5.832 Q-4.488,6.096,-4.62,6.276 L-7.188,9.936 L-4.116,9.936 L-4.116,7.236 z M-0.74400026,12.18 Q-0.74400026,11.736,-0.52800024,11.556 Q-0.31200027,11.376,-0.012000322,11.376 Q0.2999997,11.376,0.52199984,11.556 Q0.7439997,11.736,0.7439997,12.18 Q0.7439997,12.612,0.52199984,12.804 Q0.2999997,12.996,-0.012000322,12.996 Q-0.31200027,12.996,-0.52800024,12.804 Q-0.74400026,12.612,-0.74400026,12.18 z M7.884,8.532 Q7.884,9.576,7.7279997,10.392 Q7.572,11.208,7.23,11.778 Q6.888,12.348,6.342,12.648 Q5.796,12.948,5.028,12.948 Q4.068,12.948,3.4379997,12.42 Q2.8079998,11.892,2.5019999,10.902 Q2.1959999,9.912,2.1959999,8.532 Q2.1959999,7.14,2.4779997,6.156 Q2.7599998,5.172,3.3839998,4.6499996 Q4.008,4.1280003,5.028,4.1280003 Q5.988,4.1280003,6.624,4.6499996 Q7.2599998,5.172,7.572,6.156 Q7.884,7.14,7.884,8.532 z M3.2519999,8.532 Q3.2519999,9.708,3.4259996,10.488 Q3.6,11.268,3.9899998,11.658 Q4.38,12.048,5.028,12.048 Q5.6759996,12.048,6.066,11.664 Q6.456,11.28,6.6359997,10.4939995 Q6.816,9.708,6.816,8.532 Q6.816,7.356,6.6359997,6.582 Q6.456,5.808,6.066,5.418 Q5.6759996,5.028,5.028,5.028 Q4.38,5.028,3.9899998,5.418 Q3.6,5.808,3.4259996,6.582 Q3.2519999,7.356,3.2519999,8.532 z" fill="#000000" stroke="none" transform="matrix(1 0 0 1 146.66666 263.656)"/>
+<path d="M-7.8120003,9.168 Q-7.8120003,8.424,-7.71,7.704 Q-7.6080003,6.984,-7.356,6.342 Q-7.104,5.7,-6.66,5.202 Q-6.216,4.7040005,-5.538,4.422 Q-4.86,4.1400003,-3.888,4.1400003 Q-3.6360002,4.1400003,-3.33,4.1639996 Q-3.0240002,4.1879997,-2.8320003,4.248 L-2.8320003,5.148 Q-3.0479999,5.076,-3.3179998,5.04 Q-3.5880003,5.004,-3.8640003,5.004 Q-4.6920004,5.004,-5.2440004,5.28 Q-5.796,5.556,-6.1140003,6.036 Q-6.432,6.516,-6.576,7.14 Q-6.7200003,7.764,-6.756,8.472 L-6.684,8.472 Q-6.504,8.184,-6.228,7.956 Q-5.952,7.728,-5.5620003,7.596 Q-5.172,7.464,-4.656,7.464 Q-3.9120002,7.464,-3.354,7.77 Q-2.796,8.076,-2.4840002,8.658 Q-2.172,9.24,-2.172,10.068 Q-2.172,10.956,-2.508,11.604 Q-2.8439999,12.252,-3.4500003,12.6 Q-4.056,12.948,-4.896,12.948 Q-5.5080004,12.948,-6.0360003,12.72 Q-6.564,12.492,-6.966,12.024 Q-7.368,11.556,-7.59,10.842 Q-7.8120003,10.128,-7.8120003,9.168 z M-4.908,12.06 Q-4.152,12.06,-3.684,11.574 Q-3.216,11.088,-3.216,10.068 Q-3.216,9.252,-3.63,8.771999 Q-4.044,8.292,-4.8719997,8.292 Q-5.436,8.292,-5.856,8.526 Q-6.276,8.76,-6.51,9.12 Q-6.744,9.48,-6.744,9.864 Q-6.744,10.26,-6.63,10.644 Q-6.5160003,11.028,-6.282,11.352 Q-6.0480003,11.676001,-5.7060003,11.868 Q-5.3640003,12.06,-4.908,12.06 z M-0.74400026,12.18 Q-0.74400026,11.736,-0.52800024,11.556 Q-0.31200027,11.376,-0.012000322,11.376 Q0.2999997,11.376,0.52199984,11.556 Q0.7439997,11.736,0.7439997,12.18 Q0.7439997,12.612,0.52199984,12.804 Q0.2999997,12.996,-0.012000322,12.996 Q-0.31200027,12.996,-0.52800024,12.804 Q-0.74400026,12.612,-0.74400026,12.18 z M7.884,8.532 Q7.884,9.576,7.7279997,10.392 Q7.572,11.208,7.23,11.778 Q6.888,12.348,6.342,12.648 Q5.796,12.948,5.028,12.948 Q4.068,12.948,3.4379997,12.42 Q2.8079998,11.892,2.5019999,10.902 Q2.1959999,9.912,2.1959999,8.532 Q2.1959999,7.14,2.4779997,6.156 Q2.7599998,5.172,3.3839998,4.6499996 Q4.008,4.1280003,5.028,4.1280003 Q5.988,4.1280003,6.624,4.6499996 Q7.2599998,5.172,7.572,6.156 Q7.884,7.14,7.884,8.532 z M3.2519999,8.532 Q3.2519999,9.708,3.4259996,10.488 Q3.6,11.268,3.9899998,11.658 Q4.38,12.048,5.028,12.048 Q5.6759996,12.048,6.066,11.664 Q6.456,11.28,6.6359997,10.4939995 Q6.816,9.708,6.816,8.532 Q6.816,7.356,6.6359997,6.582 Q6.456,5.808,6.066,5.418 Q5.6759996,5.028,5.028,5.028 Q4.38,5.028,3.9899998,5.418 Q3.6,5.808,3.4259996,6.582 Q3.2519999,7.356,3.2519999,8.532 z" fill="#000000" stroke="none" transform="matrix(1 0 0 1 217.77777 263.656)"/>
+<path d="M-5.052,4.1400003 Q-4.296,4.1400003,-3.7200003,4.3739996 Q-3.144,4.608,-2.8140001,5.064 Q-2.4840002,5.52,-2.4840002,6.192 Q-2.4840002,6.708,-2.7059999,7.092 Q-2.928,7.476,-3.3000002,7.77 Q-3.672,8.064,-4.116,8.292 Q-3.5880003,8.544001,-3.1560001,8.8619995 Q-2.724,9.18,-2.466,9.6 Q-2.2080002,10.02,-2.2080002,10.608 Q-2.2080002,11.328,-2.5560002,11.85 Q-2.9040003,12.372,-3.534,12.66 Q-4.164,12.948,-5.016,12.948 Q-5.94,12.948,-6.5820003,12.672 Q-7.224,12.396,-7.554,11.886 Q-7.8840003,11.376,-7.8840003,10.644 Q-7.8840003,10.056,-7.638,9.624001 Q-7.392,9.192,-6.984,8.88 Q-6.576,8.568,-6.108,8.352 Q-6.528,8.1119995,-6.87,7.806 Q-7.212,7.5,-7.41,7.104 Q-7.6080003,6.708,-7.6080003,6.18 Q-7.6080003,5.52,-7.2720003,5.07 Q-6.936,4.62,-6.36,4.38 Q-5.7840004,4.1400003,-5.052,4.1400003 z M-6.852,10.656 Q-6.852,11.28,-6.408,11.694 Q-5.9639997,12.108,-5.04,12.108 Q-4.164,12.108,-3.7020001,11.694 Q-3.2400002,11.28,-3.2400002,10.62 Q-3.2400002,10.2,-3.462,9.882 Q-3.684,9.564,-4.086,9.312 Q-4.488,9.059999,-5.04,8.856 L-5.2320004,8.784 Q-5.76,9.012,-6.12,9.276 Q-6.48,9.54,-6.6660004,9.875999 Q-6.852,10.212,-6.852,10.656 z M-5.064,4.992 Q-5.724,4.992,-6.15,5.31 Q-6.576,5.628,-6.576,6.228 Q-6.576,6.672,-6.366,6.972 Q-6.156,7.272,-5.796,7.482 Q-5.436,7.692,-5.004,7.884 Q-4.584,7.704,-4.254,7.488 Q-3.9240003,7.272,-3.7260003,6.966 Q-3.5279999,6.66,-3.5279999,6.228 Q-3.5279999,5.628,-3.948,5.31 Q-4.368,4.992,-5.064,4.992 z M-0.74400026,12.18 Q-0.74400026,11.736,-0.52800024,11.556 Q-0.31200027,11.376,-0.012000322,11.376 Q0.2999997,11.376,0.52199984,11.556 Q0.7439997,11.736,0.7439997,12.18 Q0.7439997,12.612,0.52199984,12.804 Q0.2999997,12.996,-0.012000322,12.996 Q-0.31200027,12.996,-0.52800024,12.804 Q-0.74400026,12.612,-0.74400026,12.18 z M7.884,8.532 Q7.884,9.576,7.7279997,10.392 Q7.572,11.208,7.23,11.778 Q6.888,12.348,6.342,12.648 Q5.796,12.948,5.028,12.948 Q4.068,12.948,3.4379997,12.42 Q2.8079998,11.892,2.5019999,10.902 Q2.1959999,9.912,2.1959999,8.532 Q2.1959999,7.14,2.4779997,6.156 Q2.7599998,5.172,3.3839998,4.6499996 Q4.008,4.1280003,5.028,4.1280003 Q5.988,4.1280003,6.624,4.6499996 Q7.2599998,5.172,7.572,6.156 Q7.884,7.14,7.884,8.532 z M3.2519999,8.532 Q3.2519999,9.708,3.4259996,10.488 Q3.6,11.268,3.9899998,11.658 Q4.38,12.048,5.028,12.048 Q5.6759996,12.048,6.066,11.664 Q6.456,11.28,6.6359997,10.4939995 Q6.816,9.708,6.816,8.532 Q6.816,7.356,6.6359997,6.582 Q6.456,5.808,6.066,5.418 Q5.6759996,5.028,5.028,5.028 Q4.38,5.028,3.9899998,5.418 Q3.6,5.808,3.4259996,6.582 Q3.2519999,7.356,3.2519999,8.532 z" fill="#000000" stroke="none" transform="matrix(1 0 0 1 288.8889 263.656)"/>
+<path d="M-7.644,12.828 L-8.676001,12.828 L-8.676001,6.84 Q-8.676001,6.492,-8.67,6.252 Q-8.6640005,6.012,-8.652,5.802 Q-8.64,5.592,-8.628,5.364 Q-8.82,5.556,-8.976,5.688 Q-9.132,5.82,-9.372,6.024 L-10.284,6.768 L-10.836,6.06 L-8.52,4.26 L-7.644,4.26 L-7.644,12.828 z M1.2359996,8.532 Q1.2359996,9.576,1.0799994,10.392 Q0.9239998,11.208,0.5819998,11.778 Q0.23999977,12.348,-0.30600023,12.648 Q-0.85200024,12.948,-1.6200004,12.948 Q-2.5800004,12.948,-3.2100005,12.42 Q-3.8400004,11.892,-4.1460004,10.902 Q-4.4520006,9.912,-4.4520006,8.532 Q-4.4520006,7.14,-4.1700006,6.156 Q-3.8880005,5.172,-3.2640004,4.6499996 Q-2.6400003,4.1280003,-1.6200004,4.1280003 Q-0.6600003,4.1280003,-0.024000168,4.6499996 Q0.6119995,5.172,0.9239998,6.156 Q1.2359996,7.14,1.2359996,8.532 z M-3.3960004,8.532 Q-3.3960004,9.708,-3.2220006,10.488 Q-3.0480003,11.268,-2.6580005,11.658 Q-2.2680004,12.048,-1.6200004,12.048 Q-0.9720006,12.048,-0.58200026,11.664 Q-0.19200039,11.28,-0.012000561,10.4939995 Q0.16799974,9.708,0.16799974,8.532 Q0.16799974,7.356,-0.012000561,6.582 Q-0.19200039,5.808,-0.58200026,5.418 Q-0.9720006,5.028,-1.6200004,5.028 Q-2.2680004,5.028,-2.6580005,5.418 Q-3.0480003,5.808,-3.2220006,6.582 Q-3.3960004,7.356,-3.3960004,8.532 z M2.6879995,12.18 Q2.6879995,11.736,2.9039993,11.556 Q3.1199994,11.376,3.4199994,11.376 Q3.7319994,11.376,3.9539995,11.556 Q4.1759996,11.736,4.1759996,12.18 Q4.1759996,12.612,3.9539995,12.804 Q3.7319994,12.996,3.4199994,12.996 Q3.1199994,12.996,2.9039993,12.804 Q2.6879995,12.612,2.6879995,12.18 z M11.316,8.532 Q11.316,9.576,11.16,10.392 Q11.004,11.208,10.662,11.778 Q10.32,12.348,9.774,12.648 Q9.228,12.948,8.459999,12.948 Q7.4999995,12.948,6.8699994,12.42 Q6.24,11.892,5.9339995,10.902 Q5.6279993,9.912,5.6279993,8.532 Q5.6279993,7.14,5.9099994,6.156 Q6.1919994,5.172,6.8159995,4.6499996 Q7.4399996,4.1280003,8.459999,4.1280003 Q9.42,4.1280003,10.056,4.6499996 Q10.691999,5.172,11.004,6.156 Q11.316,7.14,11.316,8.532 z M6.6839995,8.532 Q6.6839995,9.708,6.8579993,10.488 Q7.0319996,11.268,7.4219995,11.658 Q7.8119993,12.048,8.459999,12.048 Q9.108,12.048,9.497999,11.664 Q9.888,11.28,10.067999,10.4939995 Q10.247999,9.708,10.247999,8.532 Q10.247999,7.356,10.067999,6.582 Q9.888,5.808,9.497999,5.418 Q9.108,5.028,8.459999,5.028 Q7.8119993,5.028,7.4219995,5.418 Q7.0319996,5.808,6.8579993,6.582 Q6.6839995,7.356,6.6839995,8.532 z" fill="#000000" stroke="none" transform="matrix(1 0 0 1 360 263.656)"/>
+<rect fill="none" height="235.656" stroke="#000000" stroke-width="1" width="360" x="20" y="20"/>
+</svg>
\ No newline at end of file
diff --git a/tests/src/tests.rs b/tests/src/tests.rs
index f6f44b1..af84a3b 100644
--- a/tests/src/tests.rs
+++ b/tests/src/tests.rs
@@ -45,6 +45,7 @@ fn line2(x: &[f64], y: &[f64]) -> des::series::Line {
 mod axes;
 mod interp;
 mod legend;
+mod nulls;
 mod subplots;
 
 #[test]
diff --git a/tests/src/tests/nulls.rs b/tests/src/tests/nulls.rs
new file mode 100644
index 0000000..2a617cf
--- /dev/null
+++ b/tests/src/tests/nulls.rs
@@ -0,0 +1,30 @@
+use plotive::des;
+
+use super::fig_small;
+use crate::{TestHarness, assert_fig_eq_ref};
+
+#[test]
+fn line_lin_null_end() {
+    let x = vec![1.0, 2.0, 3.0, 4.0, 5.0];
+    let y = vec![1.0, 2.0, 3.0, 4.0, f64::NAN];
+    let series = des::series::Line::new(x.into(), y.into()).into();
+    let plot =
+        des::Plot::new(vec![series]).with_x_axis(des::Axis::default().with_title("x axis".into()));
+    let fig = fig_small(plot);
+
+    assert_fig_eq_ref!(&fig, "nulls/line-lin-null-end");
+}
+
+#[test]
+fn line_spline_null_middle() {
+    let x = vec![1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0];
+    let y = vec![0.0, 2.0, 3.0, 1.0, 4.0, f64::NAN, 2.0, 3.0, 1.0, 4.0];
+
+    let plot = des::series::Line::new(x.into(), y.into())
+        .with_interpolation(des::series::Interpolation::Spline)
+        .into_plot()
+        .with_x_axis(des::Axis::default().with_ticks(Default::default()));
+    let fig = fig_small(plot);
+
+    assert_fig_eq_ref!(&fig, "nulls/line-spline-null-middle");
+}