diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 38e721a..fe71652 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -301,8 +301,8 @@
 			else
 				(*iter)->Has_Android_Secure = false;
 
-			if ((*iter)->Is_Super)
-				Prepare_Super_Volume((*iter));
+			if ((*iter)->Is_Super && !Prepare_Super_Volume(*iter))
+				Partitions.erase(iter--);
 		}
 
 		Unlock_Block_Partitions();
@@ -3444,6 +3444,7 @@
 		if ((*iter)->Is_Super) {
 			if (!Prepare_Super_Volume(*iter)) {
 				status = false;
+				Partitions.erase(iter--);
 			}
 			PartitionManager.Output_Partition(*iter);
 		}