--- e2fsprogs-1.39/lib/blkid/probe.c
+++ e2fsprogs-1.39/lib/blkid/probe.c
@@ -348,8 +348,8 @@
 	}
 
 	if (vol_label && memcmp(vol_label, no_name, 11)) {
-		label = vol_label;
-		label_len = figure_label_len(vol_label, 11);
+		if ((label_len = figure_label_len(vol_label, 11)))
+			label = vol_label;
 	}
 
 	/* We can't just print them as %04X, because they are unaligned */