diff --git a/libntfs/runlist.c b/libntfs/runlist.c
index a667882f..d8c3f7b4 100644
--- a/libntfs/runlist.c
+++ b/libntfs/runlist.c
@@ -885,7 +885,7 @@ mpa_err:
 		goto err_out;
 	}
 	/* Setup not mapped runlist element if this is the base extent. */
-	if (!attr->lowest_vcn) {
+	if (deltaxcn && !attr->lowest_vcn) {
 		VCN max_cluster;
 
 		max_cluster = (sle64_to_cpu(attr->allocated_size) +
@@ -896,7 +896,7 @@ mpa_err:
 		 * highest cluster, the runlist is either corrupt or, more
 		 * likely, there are more extents following this one.
 		 */
-		if (deltaxcn && deltaxcn < --max_cluster) {
+		if (deltaxcn < --max_cluster) {
 			Dprintf("More extents to follow; deltaxcn = 0x%llx, "
 					"max_cluster = 0x%llx\n",
 					(long long)deltaxcn,