diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index 52ee8b6dbd..c28b8ab992 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -288,7 +288,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 };