diff --git a/partitionmanager.cpp b/partitionmanager.cpp
index 9a2a3aa..8aede55 100755
--- a/partitionmanager.cpp
+++ b/partitionmanager.cpp
@@ -288,11 +288,17 @@
 
 		if (parse_userdata) {
 			if (strstr(fstab_line, "/metadata") && !strstr(fstab_line, "/data")) {
-				Partitions.erase(std::find(Partitions.begin(), Partitions.end(), meta));
-				delete meta;
+				if (meta) {
+					Partitions.erase(std::find(Partitions.begin(), Partitions.end(), meta));
+					delete meta;
+					meta = NULL;
+				}
 			} else if (strstr(fstab_line, "/data")) {
-				Partitions.erase(std::find(Partitions.begin(), Partitions.end(), data));
-				delete data;
+				if (data) {
+					Partitions.erase(std::find(Partitions.begin(), Partitions.end(), data));
+					delete data;
+					data = NULL;
+				}
 			} else {
 				continue;
 			}