diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp
index 1e85a10b6..d7fb937d0 100644
--- a/src/slic3r/GUI/3DBed.cpp
+++ b/src/slic3r/GUI/3DBed.cpp
@@ -499,10 +499,10 @@ void Bed3D::render_model() const
         if (shader != nullptr) {
             shader->start_using();
             shader->set_uniform("emission_factor", 0.0);
-            ::glPushMatrix();
-            ::glTranslated(m_model_offset.x(), m_model_offset.y(), m_model_offset.z());
+            glsafe(::glPushMatrix());
+            glsafe(::glTranslated(m_model_offset.x(), m_model_offset.y(), m_model_offset.z()));
             model->render();
-            ::glPopMatrix();
+            glsafe(::glPopMatrix());
             shader->stop_using();
         }
     }
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
index 425e11f73..115a675ac 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp
@@ -359,10 +359,10 @@ void ObjectClipper::render_cut() const
         clipper->set_plane(*m_clp);
         clipper->set_transformation(trafo);
 
-        ::glPushMatrix();
-        ::glColor3f(1.0f, 0.37f, 0.0f);
+        glsafe(::glPushMatrix());
+        glsafe(::glColor3f(1.0f, 0.37f, 0.0f));
         clipper->render_cut();
-        ::glPopMatrix();
+        glsafe(::glPopMatrix());
 
         ++clipper_id;
     }
@@ -472,10 +472,10 @@ void SupportsClipper::render_cut() const
     m_clipper->set_plane(*ocl->get_clipping_plane());
     m_clipper->set_transformation(supports_trafo);
 
-    ::glPushMatrix();
-    ::glColor3f(1.0f, 0.f, 0.37f);
+    glsafe(::glPushMatrix());
+    glsafe(::glColor3f(1.0f, 0.f, 0.37f));
     m_clipper->render_cut();
-    ::glPopMatrix();
+    glsafe(::glPopMatrix());
 }