diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp
index bf1050903..36e25849b 100644
--- a/src/slic3r/GUI/CalibrationWizard.cpp
+++ b/src/slic3r/GUI/CalibrationWizard.cpp
@@ -826,6 +826,7 @@ void FlowRateWizard::on_cali_save()
             if (!save_preset(old_preset_name, new_preset_name.ToStdString(), key_value_map, message)) {
                 MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK);
                 error_msg_dlg.ShowModal();
+                return;
             }
 
             MessageDialog msg_dlg(nullptr, _L("Flow rate calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK);
@@ -1077,7 +1078,11 @@ void MaxVolumetricSpeedWizard::on_cali_save()
     if (!save_preset(old_preset_name, new_preset_name, key_value_map, message)) {
         MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK);
         error_msg_dlg.ShowModal();
+        return;
     }
+
+    MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK);
+    msg_dlg.ShowModal();
 }
 
 void MaxVolumetricSpeedWizard::on_cali_job_finished(wxString evt_data)
diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
index 71b12b5b4..1b30b2e1b 100644
--- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp
@@ -1463,7 +1463,7 @@ void CalibrationPresetPage::select_default_compatible_filament()
 
             Preset* preset = const_cast<Preset *>(fcb->GetComboBox()->get_selected_preset());
             if (m_cali_filament_mode == CalibrationFilamentMode::CALI_MODEL_SINGLE) {
-                if (is_filaments_compatiable({preset})) {
+                if (preset && is_filaments_compatiable({preset})) {
                     fcb->GetRadioBox()->SetValue(true);
                     wxCommandEvent event(wxEVT_RADIOBUTTON);
                     event.SetEventObject(this);
@@ -1473,6 +1473,10 @@ void CalibrationPresetPage::select_default_compatible_filament()
                 } else
                     fcb->GetRadioBox()->SetValue(false);
             } else if (m_cali_filament_mode == CalibrationFilamentMode::CALI_MODEL_MULITI) {
+                if (!preset) {
+                    fcb->GetCheckBox()->SetValue(false);
+                    continue;
+                }
                 multi_select_filaments.push_back(preset);
                 if (!is_filaments_compatiable(multi_select_filaments)) {
                     multi_select_filaments.pop_back();
@@ -1490,7 +1494,7 @@ void CalibrationPresetPage::select_default_compatible_filament()
     }
     else if (m_ext_spool_radiobox->GetValue()){
         Preset *preset = const_cast<Preset *>(m_virtual_tray_comboBox->GetComboBox()->get_selected_preset());
-        if (is_filaments_compatiable({preset})) {
+        if (preset && is_filaments_compatiable({preset})) {
             m_virtual_tray_comboBox->GetRadioBox()->SetValue(true);
         } else
             m_virtual_tray_comboBox->GetRadioBox()->SetValue(false);
diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp
index c14a78449..2178d678e 100644
--- a/src/slic3r/Utils/CalibUtils.cpp
+++ b/src/slic3r/Utils/CalibUtils.cpp
@@ -826,7 +826,7 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, std::string &error_m
         return;
     }
 
-    if (obj_->is_in_printing()) {
+    if (obj_->is_in_upgrading()) {
         error_message = L("Cannot send the print job when the printer is updating firmware");
         return;
     }