diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index 3f2a581f74..024e11e0e3 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -289,7 +289,8 @@ void BOARD::UpdateRatsnestExclusions()
     GetConnectivity()->RunOnUnconnectedEdges(
             [&]( CN_EDGE& aEdge )
             {
-                if( aEdge.GetSourceNode() && aEdge.GetTargetNode() )
+                if( aEdge.GetSourceNode() && aEdge.GetTargetNode()
+                    && aEdge.GetSourceNode()->Valid() && aEdge.GetTargetNode()->Valid() )
                 {
                     std::pair<KIID, KIID> ids = { aEdge.GetSourceNode()->Parent()->m_Uuid,
                                                   aEdge.GetTargetNode()->Parent()->m_Uuid };