diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 8f738d8937..845ed0325f 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -1518,7 +1518,9 @@ class CuraApplication(QtApplication):
 
     @pyqtSlot("QSize")
     def setMinimumWindowSize(self, size):
-        self.getMainWindow().setMinimumSize(size)
+        main_window = self.getMainWindow()
+        if main_window:
+            main_window.setMinimumSize(size)
 
     def getBuildVolume(self):
         return self._volume
diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py
index 4b1ab7c19a..667b468bc0 100755
--- a/cura/Settings/CuraContainerStack.py
+++ b/cura/Settings/CuraContainerStack.py
@@ -48,7 +48,7 @@ class CuraContainerStack(ContainerStack):
         self._empty_material = self._container_registry.findInstanceContainers(id = "empty_material")[0] #type: InstanceContainer
         self._empty_variant = self._container_registry.findInstanceContainers(id = "empty_variant")[0] #type: InstanceContainer
 
-        self._containers = [self._empty_instance_container for i in range(len(_ContainerIndexes.IndexTypeMap))] #type: List[Union[InstanceContainer, DefinitionContainer]]
+        self._containers = [self._empty_instance_container for i in range(len(_ContainerIndexes.IndexTypeMap))] #type: List[ContainerInterface]
         self._containers[_ContainerIndexes.QualityChanges] = self._empty_quality_changes
         self._containers[_ContainerIndexes.Quality] = self._empty_quality
         self._containers[_ContainerIndexes.Material] = self._empty_material
diff --git a/cura/SingleInstance.py b/cura/SingleInstance.py
index 8109123df5..cf07b143c6 100644
--- a/cura/SingleInstance.py
+++ b/cura/SingleInstance.py
@@ -95,7 +95,9 @@ class SingleInstance:
                 elif command == "focus":
                     # Operating systems these days prevent windows from moving around by themselves.
                     # 'alert' or flashing the icon in the taskbar is the best thing we do now.
-                    self._application.callLater(lambda: self._application.getMainWindow().alert(0))
+                    main_window = self._application.getMainWindow()
+                    if main_window is not None:
+                        self._application.callLater(lambda: main_window.alert(0)) # type: ignore # I don't know why MyPy complains here
 
                 # Command: Close the socket connection. We're done.
                 elif command == "close-connection":