diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py
index 53cc87a7b3..015795e506 100755
--- a/cura/PlatformPhysics.py
+++ b/cura/PlatformPhysics.py
@@ -181,7 +181,7 @@ class PlatformPhysics:
 
         if tool.getPluginId() == "TranslateTool":
             for node in Selection.getAllSelectedObjects():
-                if node.getBoundingBox().bottom < 0:
+                if node.getBoundingBox() and node.getBoundingBox().bottom < 0:
                     if not node.getDecorator(ZOffsetDecorator.ZOffsetDecorator):
                         node.addDecorator(ZOffsetDecorator.ZOffsetDecorator())
 
diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py
index e0ec6c4d14..4610e6a454 100755
--- a/cura/Settings/ExtruderManager.py
+++ b/cura/Settings/ExtruderManager.py
@@ -248,6 +248,8 @@ class ExtruderManager(QObject):
                 extruder_nr = int(global_stack.getProperty(extruder_nr_feature_name, "value"))
                 if extruder_nr == -1:
                     continue
+                if str(extruder_nr) not in self.extruderIds:
+                    extruder_nr = int(self._application.getMachineManager().defaultExtruderPosition)
                 used_extruder_stack_ids.add(self.extruderIds[str(extruder_nr)])
 
         # Check support extruders
diff --git a/cura_app.py b/cura_app.py
index 33370a1dbe..6c9839e79c 100755
--- a/cura_app.py
+++ b/cura_app.py
@@ -53,7 +53,7 @@ if with_sentry_sdk:
 
     if ApplicationMetadata.CuraVersion == "master":
         sentry_env = "development"  # Master is always a development version.
-    elif ApplicationMetadata.CuraVersion in ["beta", "BETA"]:
+    elif "beta" in ApplicationMetadata.CuraVersion or "BETA" in ApplicationMetadata.CuraVersion:
         sentry_env = "beta"
     try:
         if ApplicationMetadata.CuraVersion.split(".")[2] == "99":