diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c
index fdc8024..601d35b 100644
--- a/source/ubinstall-gtk-page-switch.c
+++ b/source/ubinstall-gtk-page-switch.c
@@ -517,7 +517,7 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){
         case YON_PAGE_COMPLETION:
             const char *endaction = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->ConfigHubRebootCombo));
             if (!yon_char_is_empty(endaction)&&!strcmp(endaction,"close")){
-                on_exit_accepted(widgets);
+                on_yon_exit(NULL,NULL,widgets);
             }
             break;
         case YON_PAGE_RECOVERY_PROCESS:{
diff --git a/source/ubinstall-gtk-saving.c b/source/ubinstall-gtk-saving.c
index 9b98b7c..413e73e 100644
--- a/source/ubinstall-gtk-saving.c
+++ b/source/ubinstall-gtk-saving.c
@@ -444,12 +444,14 @@ void yon_config_restore(main_window *){
     yon_launch(yon_debug_output("%s\n","ubconfig --source system remove [autoinstall]"));
     yon_config_custom_apply(&main_config.startup_config);
     yon_config_set_status_full(1);
-    int size;
+    int size = 0;
     config_str parameters = yon_config_get_save_parameters(&size);
-    char *command_params = yon_char_parsed_to_string(parameters,size, " ");
-    char *command = ubconfig_set_command_full("system","",command_params);
-    yon_debug_output("%s\n",command);
-    yon_launch(command);
-    yon_char_parsed_free(parameters,size);
-    free(command);
+    if (size){
+        char *command_params = yon_char_parsed_to_string(parameters,size, " ");
+        char *command = ubconfig_set_command_full("system","",command_params);
+        yon_debug_output("%s\n",command);
+        yon_launch(command);
+        yon_char_parsed_free(parameters,size);
+        free(command);
+    }
 }
\ No newline at end of file