diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
index 834ccf324d4..0211700ab27 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.cpp
@@ -62,10 +62,12 @@ void AssociationItem::update(const Style *style)
 
     QMT_CHECK(m_arrow);
     QGraphicsItem *endAItem = m_diagramSceneModel->graphicsItem(m_association->endAUid());
-    QMT_CHECK(endAItem);
+    if (!endAItem)
+        return;
     placeEndLabels(m_arrow->firstLineSegment(), m_endAName, m_endACardinality, endAItem, m_arrow->startHeadLength());
     QGraphicsItem *endBItem = m_diagramSceneModel->graphicsItem(m_association->endBUid());
-    QMT_CHECK(endBItem);
+    if (!endBItem)
+        return;
     placeEndLabels(m_arrow->lastLineSegment(), m_endBName, m_endBCardinality, endBItem, m_arrow->endHeadLength());
 }
 
diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
index c3b26f0f199..caa54576e35 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.cpp
@@ -492,7 +492,8 @@ QPointF RelationItem::calcEndPoint(const Uid &end, const Uid &otherEnd, int near
 QPointF RelationItem::calcEndPoint(const Uid &end, const QPointF &otherEndPos, int nearestIntermediatePointIndex)
 {
     QGraphicsItem *endItem = m_diagramSceneModel->graphicsItem(end);
-    QMT_CHECK(endItem);
+    if (!endItem)
+        return QPointF(0, 0);
     auto endObjectItem = dynamic_cast<IIntersectionable *>(endItem);
     QPointF endPos;
     if (endObjectItem) {