lib/metadata/integrity_manip.c | 10 +++++++---

 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/metadata/integrity_manip.c b/lib/metadata/integrity_manip.c

index 53ab1b3..abf90d8 100644

--- a/lib/metadata/integrity_manip.c

+++ b/lib/metadata/integrity_manip.c

@@ -773,9 +773,13 @@ int lv_add_integrity_to_raid(struct logical_volume *lv, struct integrity_setting

 bad:

 	log_error("Failed to add integrity.");

-	for (s = 0; s < revert_meta_lvs; s++) {

-		if (!lv_remove(imeta_lvs[s]))

-			log_error("New integrity metadata LV may require manual removal.");

+	if (revert_meta_lvs) {

+		for (s = 0; s < DEFAULT_RAID_MAX_IMAGES; s++) {

+			if (!imeta_lvs[s])

+				continue;

+			if (!lv_remove(imeta_lvs[s]))

+				log_error("New integrity metadata LV may require manual removal.");

+		}

 	}

 	if (!vg_write(vg) || !vg_commit(vg))