Index: base/setup/usetup/interface/usetup.c
===================================================================
--- base/setup/usetup/interface/usetup.c	(revision 71301)
+++ base/setup/usetup/interface/usetup.c	(working copy)
@@ -1978,6 +1978,8 @@
         {
             if (ConfirmQuit(Ir) == TRUE)
                 return QUIT_PAGE;
+
+            break;
         }
         else if (Cancel == TRUE)
         {
@@ -2133,6 +2135,8 @@
         {
             if (ConfirmQuit(Ir) == TRUE)
                 return QUIT_PAGE;
+
+            break;
         }
         else if (Cancel == TRUE)
         {
@@ -2287,6 +2291,8 @@
         {
             if (ConfirmQuit(Ir) == TRUE)
                 return QUIT_PAGE;
+
+            break;
         }
         else if (Cancel == TRUE)
         {
@@ -2375,7 +2381,7 @@
         }
     }
 
-    return SELECT_PARTITION_PAGE;
+    return CONFIRM_DELETE_SYSTEM_PARTITION_PAGE;
 }
 
 
@@ -3259,8 +3265,11 @@
     ULONG Length;
 
     /* We do not need the filsystem list any more */
-    DestroyFileSystemList(FileSystemList);
-    FileSystemList = NULL;
+    if (FileSystemList != NULL)
+    {
+        DestroyFileSystemList(FileSystemList);
+        FileSystemList = NULL;
+    }
 
     if (PartitionList == NULL ||
         PartitionList->CurrentDisk == NULL ||