diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index d95bd17e96..754ba9b7ce 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -1024,7 +1024,13 @@ MainWindow::_Delete(BDiskDevice* disk, partition_id selectedPartition)
 		return;
 	}
 
-	modificationPreparer.CommitModifications();
+	ret = modificationPreparer.CommitModifications();
+
+	if (ret != B_OK) {
+		_DisplayPartitionError("Failed to delete the partition. "
+			"This operation is exiting.\nNo changes have been made!\n");
+		return;
+	}
 
 	_ScanDrives();
 	fDiskView->ForceUpdate();