diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 02a8e3189..81a14d17c 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -299,7 +299,8 @@ void TWPartitionManager::Setup_Fstab_Partitions(bool Display_Error) {
 		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();
@@ -4089,6 +4090,7 @@ bool TWPartitionManager::Prepare_All_Super_Volumes() {
 		if ((*iter)->Is_Super) {
 			if (!Prepare_Super_Volume(*iter)) {
 				status = false;
+				Partitions.erase(iter--);
 			}
 			PartitionManager.Output_Partition(*iter);
 		}