diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index 8aa060896a..61fec50992 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -92,7 +92,7 @@ class MachineManager(QObject):
         self._printer_output_devices = []
         Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged)
 
-        if active_machine_id != "":
+        if active_machine_id != "" and ContainerRegistry.getInstance().findContainerStacks(id = active_machine_id):
             # An active machine was saved, so restore it.
             self.setActiveMachine(active_machine_id)
             if self._global_container_stack and self._global_container_stack.getProperty("machine_extruder_count", "value") > 1:
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Quality.inst.cfg
similarity index 100%
rename from resources/quality/ultimaker3/um3_aa0.8_CPEP_Draft_Print.inst.cfg
rename to resources/quality/ultimaker3/um3_aa0.8_CPEP_Not_Supported_Quality.inst.cfg
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Quality.inst.cfg
similarity index 100%
rename from resources/quality/ultimaker3/um3_aa0.8_PC_Draft_Print.inst.cfg
rename to resources/quality/ultimaker3/um3_aa0.8_PC_Not_Supported_Quality.inst.cfg