From 4e5f0a38508540bebebe271c38eaa51323249e3a Mon Sep 17 00:00:00 2001
From: Abdullah Tahiri <abdullah.tahiri.yo@gmail.com>
Date: Fri, 8 Jan 2021 15:48:22 +0100
Subject: [PATCH] Sketcher: Check for null geometry shapes before adding them
 to the toShape array

---
 src/Mod/Sketcher/App/Sketch.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Mod/Sketcher/App/Sketch.cpp b/src/Mod/Sketcher/App/Sketch.cpp
index c73fe03567..4027a40321 100644
--- a/src/Mod/Sketcher/App/Sketch.cpp
+++ b/src/Mod/Sketcher/App/Sketch.cpp
@@ -4121,8 +4121,11 @@ TopoShape Sketch::toShape(void) const
         auto gf = GeometryFacade::getFacade(it->geo);
         if (!it->external && !gf->getConstruction()) {
 
-            if (it->type != Point)
-                edge_list.push_back(TopoDS::Edge(it->geo->toShape()));
+            if (it->type != Point) {
+                auto shape =it->geo->toShape();
+                if(!shape.IsNull())
+                    edge_list.push_back(TopoDS::Edge(shape));
+            }
             else
                 vertex_list.push_back(TopoDS::Vertex(it->geo->toShape()));
         }