diff --git a/dev/gnome/engauge-digitizer.appdata.xml b/dev/gnome/engauge-digitizer.appdata.xml
index acd578e0..ac766dfe 100644
--- a/dev/gnome/engauge-digitizer.appdata.xml
+++ b/dev/gnome/engauge-digitizer.appdata.xml
@@ -68,10 +68,10 @@
none
-
+
- - Fix for point match
+ - Fix hang when exporting multiple curves when any one curve has no points
diff --git a/test/export_empty_curve.csv_expected_1 b/test/export_empty_curve.csv_expected_1
new file mode 100644
index 00000000..ca177db2
--- /dev/null
+++ b/test/export_empty_curve.csv_expected_1
@@ -0,0 +1,25 @@
+x,Curve1,Curve2
+-5.0202,-0.9158,
+-4.5363,-1.0396,
+-4.0524,-1.1634,
+-3.5887,-1.3366,
+-3.125,-1.5594,
+-2.6613,-1.8317,
+-2.2581,-2.1782,
+-1.875,-2.599,
+-1.5927,-3.0941,
+-1.371,-3.6386,
+-1.1895,-4.2079,
+-1.0484,-4.802,
+0.9476,5.0248,
+1.1089,4.4554,
+1.2903,3.8861,
+1.5121,3.3168,
+1.7944,2.8218,
+2.1371,2.3762,
+2.5403,2.005,
+2.9839,1.7079,
+3.4476,1.4851,
+3.9315,1.3119,
+4.4153,1.1634,
+4.879,1.0644,
diff --git a/test/export_empty_curve.dig b/test/export_empty_curve.dig
new file mode 100644
index 00000000..c58be54e
--- /dev/null
+++ b/test/export_empty_curve.dig
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/export_empty_curve.test.commandline b/test/export_empty_curve.test.commandline
new file mode 100644
index 00000000..c334d6ca
--- /dev/null
+++ b/test/export_empty_curve.test.commandline
@@ -0,0 +1 @@
+-errorreport ../test/export_empty_curve.dig -regression -reset