diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs
index 08f9a44dc..23d95b99c 100644
--- a/PartPreviewWindow/View3D/View3DWidget.cs
+++ b/PartPreviewWindow/View3D/View3DWidget.cs
@@ -1629,14 +1629,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
                 this.SelectionChanged += (sender, e) =>
                 {
-                    Mesh mesh = SelectedMeshGroup.Meshes[0];
-                    MeshMaterialData material = MeshMaterialData.Get(mesh);
-
-                    for (int i = 0; i < extruderButtons.Count; i++)
+                    if (SelectedMeshGroup != null)
                     {
-                        if (material.MaterialIndex-1 == i)
+                        Mesh mesh = SelectedMeshGroup.Meshes[0];
+                        MeshMaterialData material = MeshMaterialData.Get(mesh);
+
+                        for (int i = 0; i < extruderButtons.Count; i++)
                         {
-                            ((RadioButton)extruderButtons[i]).Checked = true;
+                            if (material.MaterialIndex - 1 == i)
+                            {
+                                ((RadioButton)extruderButtons[i]).Checked = true;
+                            }
                         }
                     }
                 };
diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs
index ecf2aea4a..5d3ec284e 100644
--- a/PartPreviewWindow/ViewGcodeBasic.cs
+++ b/PartPreviewWindow/ViewGcodeBasic.cs
@@ -244,7 +244,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 
             meshViewerWidget = new MeshViewerWidget(viewerVolume, bedCenter, bedShape, "".Localize());
             meshViewerWidget.AnchorAll();
-            meshViewerWidget.AlwaysRenderBed = true;
+            meshViewerWidget.AllowBedRenderingWhenEmpty = true;
             gcodeDisplayWidget.AddChild(meshViewerWidget);
             meshViewerWidget.Visible = false;
             meshViewerWidget.TrackballTumbleWidget.DrawGlContent += new EventHandler(TrackballTumbleWidget_DrawGlContent);