@@ -1404,6 +1404,11 @@ def test_bar_tick_label_single():
     ax.bar("a", "b", align='edge', tick_label='0', data=data)
 
 
+def test_nan_bar_values():
+    fig, ax = plt.subplots()
+    ax.bar([0, 1], [np.nan, 4])
+
+
 def test_bar_ticklabel_fail():
     fig, ax = plt.subplots()
     ax.bar([], [])
 
@@ -459,8 +459,19 @@ def test_cleanup_closepoly():
     # component contains a NaN, then Path.cleaned should ignore not just the
     # control points but also the CLOSEPOLY, since it has nowhere valid to
     # point.
-    p = Path([[np.nan, np.nan], [np.nan, np.nan]],
-             [Path.MOVETO, Path.CLOSEPOLY])
-    cleaned = p.cleaned(remove_nans=True)
-    assert len(cleaned) == 1
-    assert cleaned.codes[0] == Path.STOP
+    paths = [
+        Path([[np.nan, np.nan], [np.nan, np.nan]],
+             [Path.MOVETO, Path.CLOSEPOLY]),
+        # we trigger a different path in the C++ code if we don't pass any
+        # codes explicitly, so we must also make sure that this works
+        Path([[np.nan, np.nan], [np.nan, np.nan]]),
+        # we should also make sure that this cleanup works if there's some
+        # multi-vertex curves
+        Path([[np.nan, np.nan], [np.nan, np.nan], [np.nan, np.nan],
+              [np.nan, np.nan]],
+             [Path.MOVETO, Path.CURVE3, Path.CURVE3, Path.CLOSEPOLY])
+    ]
+    for p in paths:
+        cleaned = p.cleaned(remove_nans=True)
+        assert len(cleaned) == 1
+        assert cleaned.codes[0] == Path.STOP
@@ -205,11 +205,13 @@ class PathNanRemover : protected EmbeddedQueue<4>
                    are found along the way, the queue is emptied, and
                    the next curve segment is handled. */
                 code = m_source->vertex(x, y);
-                if (code == agg::path_cmd_stop) {
-                    return code;
-                }
-                if (code == (agg::path_cmd_end_poly | agg::path_flags_close)
-                        && valid_segment_exists) {
+                /* The vertices attached to STOP and CLOSEPOLY left are never
+                   used, so we leave them as-is even if NaN. However, CLOSEPOLY
+                   only makes sense if a valid MOVETO command has already been
+                   emitted. */
+                if (code == agg::path_cmd_stop ||
+                    (code == (agg::path_cmd_end_poly | agg::path_flags_close) &&
+                    valid_segment_exists)) {
                     return code;
                 }
 
@@ -258,21 +260,23 @@ class PathNanRemover : protected EmbeddedQueue<4>
             code = m_source->vertex(x, y);
 
             if (code == agg::path_cmd_stop ||
-                code == (agg::path_cmd_end_poly | agg::path_flags_close)) {
+                code == (agg::path_cmd_end_poly | agg::path_flags_close) &&
+                valid_segment_exists) {
                 return code;
             }
 
             if (!(std::isfinite(*x) && std::isfinite(*y))) {
                 do {
                     code = m_source->vertex(x, y);
                     if (code == agg::path_cmd_stop ||
-                        code == (agg::path_cmd_end_poly | agg::path_flags_close)) {
+                        (code == (agg::path_cmd_end_poly | agg::path_flags_close) &&
+                        valid_segment_exists)) {
                         return code;
                     }
                 } while (!(std::isfinite(*x) && std::isfinite(*y)));
                 return agg::path_cmd_move_to;
             }
-
+            valid_segment_exists = true;
             return code;
         }
     }