matplotlib
diff --git a/‎lib/matplotlib/legend_handler.py
Copy file name to clipboardExpand all lines: lib/matplotlib/legend_handler.py
+5-2Lines changed: 5 additions & 2 deletions b/‎lib/matplotlib/legend_handler.py
Copy file name to clipboardExpand all lines: lib/matplotlib/legend_handler.py
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎lib/matplotlib/tests/test_legend.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_legend.py
+10Lines changed: 10 additions & 0 deletions b/‎lib/matplotlib/tests/test_legend.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_legend.py
+10Lines changed: 10 additions & 0 deletions
@@ -305,8 +305,11 @@ def get_numpoints(self, legend):
     def get_sizes(self, legend, orig_handle,
                  xdescent, ydescent, width, height, fontsize):
         if self._sizes is None:
-            size_max = max(orig_handle.get_sizes()) * legend.markerscale ** 2
-            size_min = min(orig_handle.get_sizes()) * legend.markerscale ** 2
+            handle_sizes = orig_handle.get_sizes()
+            if not handle_sizes:
+                handle_sizes = [1]
+            size_max = max(handle_sizes) * legend.markerscale ** 2
+            size_min = min(handle_sizes) * legend.markerscale ** 2
 
             numpoints = self.get_numpoints(legend)
             if numpoints < 4:
 
@@ -240,6 +240,16 @@ def test_legend_stackplot():
     ax.legend(loc=0)
 
 
+@cleanup
+def test_nanscatter():
+    fig, ax = plt.subplots()
+
+    h = ax.scatter([np.nan], [np.nan], marker="o",
+                   facecolor="r", edgecolor="r", s=3)
+
+    ax.legend([h], ["scatter"])
+
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)