diff --git a/src/Mod/Fem/femtaskpanels/task_material_common.py b/src/Mod/Fem/femtaskpanels/task_material_common.py
index 2855d73408..a11c36b7fa 100644
--- a/src/Mod/Fem/femtaskpanels/task_material_common.py
+++ b/src/Mod/Fem/femtaskpanels/task_material_common.py
@@ -204,6 +204,10 @@ class _TaskPanel:
     # leave task panel ***************************************************************************
     def accept(self):
         # print(self.material)
+        if self.material == {}:  # happens if material editor was canceled
+                FreeCAD.Console.PrintError("Empty material dictionary, nothing was changed.\n")
+                self.recompute_and_set_back_all()
+                return True
         if self.selectionWidget.has_equal_references_shape_types():
             self.do_not_set_thermal_zeros()
             from materialtools.cardutils import check_mat_units as checkunits