diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index b8fb18f31..5cbb412e4 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -695,6 +695,9 @@ void GLVolume::render(bool with_outline) const
                 break;
 
             ModelObject* mo = model_objects[object_idx()];
+            if (volume_idx() >= mo->volumes.size())
+                break;
+
             ModelVolume* mv = mo->volumes[volume_idx()];
             if (mv->mmu_segmentation_facets.empty())
                 break;
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index 35ff3c919..a06482f99 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -27,7 +27,7 @@ class ModelConfig;
 class ModelObject;
 class ModelVolume;
 class TriangleMesh;
-class TextInfo;
+struct TextInfo;
 enum class ModelVolumeType : int;
 
 // FIXME: broken build on mac os because of this is missing: