diff --git a/pcbnew/board_connected_item.h b/pcbnew/board_connected_item.h
index 4459b54bea..e98f724736 100644
--- a/pcbnew/board_connected_item.h
+++ b/pcbnew/board_connected_item.h
@@ -102,7 +102,7 @@ public:
      */
     int GetNetCode() const
     {
-        return m_netinfo->GetNet();
+        return m_netinfo ? m_netinfo->GetNet() : -1;
     }
 
     /**
diff --git a/pcbnew/connectivity/connectivity_data.cpp b/pcbnew/connectivity/connectivity_data.cpp
index 0f3d8af123..8edd6b5a42 100644
--- a/pcbnew/connectivity/connectivity_data.cpp
+++ b/pcbnew/connectivity/connectivity_data.cpp
@@ -666,7 +666,10 @@ const std::vector<CN_EDGE> CONNECTIVITY_DATA::GetRatsnestForItems( std::vector<B
 
     for( auto item : aItems )
     {
-        auto conn_item = static_cast<BOARD_CONNECTED_ITEM*>( item );
+        BOARD_CONNECTED_ITEM* conn_item = dyn_cast<BOARD_CONNECTED_ITEM*>( item );
+
+        if( !conn_item )
+            continue;
 
         if( item->Type() == PCB_MODULE_T )
         {