From 8fc0f4f35550ae93bf28140d364757453acd42b8 Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Fri, 8 Nov 2019 16:55:05 +0300
Subject: [PATCH] #17956 [CEA 17925] COMPERR_OCC_EXCEPTION

---
 src/SMESH/SMESH_MeshEditor.cxx    | 2 ++
 src/SMESHUtils/SMESH_FillHole.cxx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index 01e5f628a..0673fc64e 100644
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -7478,6 +7478,8 @@ void SMESH_MeshEditor::FindEqualElements( TIDSortedElemSet &        theElements,
   while ( elemIt->more() )
   {
     const SMDS_MeshElement* curElem = elemIt->next();
+    if ( curElem->IsNull() )
+      continue;
     ComparableElement      compElem = curElem;
     // check uniqueness
     const ComparableElement& elemInSet = mapOfElements.Added( compElem );
diff --git a/src/SMESHUtils/SMESH_FillHole.cxx b/src/SMESHUtils/SMESH_FillHole.cxx
index ff4a8584c..0d09f0d8e 100644
--- a/src/SMESHUtils/SMESH_FillHole.cxx
+++ b/src/SMESHUtils/SMESH_FillHole.cxx
@@ -35,7 +35,7 @@
 #include <Utils_SALOME_Exception.hxx>
 
 #include <boost/intrusive/circular_list_algorithms.hpp>
-#include <boost/container/flat_map.hpp>
+//#include <boost/container/flat_map.hpp>
 
 #include <Bnd_B3d.hxx>
 
-- 
2.39.2