diff --git a/cura/ExtrudersModel.py b/cura/ExtrudersModel.py
index 7edbb8b7c5..c8c5a21274 100644
--- a/cura/ExtrudersModel.py
+++ b/cura/ExtrudersModel.py
@@ -82,6 +82,7 @@ class ExtrudersModel(UM.Qt.ListModel.ListModel):
 
 
     def _onExtruderStackContainersChanged(self, container):
+        # The ExtrudersModel needs to be updated when the material-name or -color changes, because the user identifies extruders by material-name
         if container.getMetaDataEntry("type") == "material":
             self._updateExtruders()
 
diff --git a/plugins/SolidView/SolidView.py b/plugins/SolidView/SolidView.py
index 30b2105522..ddbc06d119 100644
--- a/plugins/SolidView/SolidView.py
+++ b/plugins/SolidView/SolidView.py
@@ -73,7 +73,7 @@ class SolidView(View):
                                 int(extruder_color[5:7], 16) / 255,
                                 1.0
                             ]
-                        except:
+                        except ValueError:
                             pass
 
                     if hasattr(node, "_outside_buildarea"):
diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml
index 6e6e28be3b..56c4385297 100644
--- a/resources/qml/SidebarSimple.qml
+++ b/resources/qml/SidebarSimple.qml
@@ -336,10 +336,10 @@ Item
             text: catalog.i18nc("@label", "Don't print support"),
             color: ""
         })
-        for(var extruderNr = 0; extruderNr < extruders.model.rowCount() ; extruderNr++) {
+        for(var extruderNumber = 0; extruderNumber < extruders.model.rowCount() ; extruderNumber++) {
             extruderModel.append({
-                text: catalog.i18nc("@label", "Print using %1").arg(extruders.model.getItem(extruderNr).name),
-                color: extruders.model.getItem(extruderNr).colour
+                text: catalog.i18nc("@label", "Print using %1").arg(extruders.model.getItem(extruderNumber).name),
+                color: extruders.model.getItem(extruderNumber).colour
             })
         }
     }