diff --git a/src/xrpath.c b/src/xrpath.c
index 57488a453..766a9e81e 100644
--- a/src/xrpath.c
+++ b/src/xrpath.c
@@ -168,6 +168,8 @@ XrPathLineTo(XrPath *path, const XPointDouble *pt)
 void
 XrPathClose(XrPath *path)
 {
-    XrSubPathClose(path->tail);
-    XrPathNewSubPath(path);
+    if (path->tail) {
+	XrSubPathClose(path->tail);
+	XrPathNewSubPath(path);
+    }
 }
diff --git a/xrpath.c b/xrpath.c
index 57488a453..766a9e81e 100644
--- a/xrpath.c
+++ b/xrpath.c
@@ -168,6 +168,8 @@ XrPathLineTo(XrPath *path, const XPointDouble *pt)
 void
 XrPathClose(XrPath *path)
 {
-    XrSubPathClose(path->tail);
-    XrPathNewSubPath(path);
+    if (path->tail) {
+	XrSubPathClose(path->tail);
+	XrPathNewSubPath(path);
+    }
 }