diff --git a/eeschema/erc/erc_item.cpp b/eeschema/erc/erc_item.cpp
index 9c7084e8b3..12cc56a6c3 100644
--- a/eeschema/erc/erc_item.cpp
+++ b/eeschema/erc/erc_item.cpp
@@ -221,6 +221,7 @@ std::vector<std::reference_wrapper<RC_ITEM>> ERC_ITEM::allItemTypes( {
                  ERC_ITEM::busEntryNeeded,
                  ERC_ITEM::endpointOffGrid,
                  ERC_ITEM::fourWayJunction,
+                 ERC_ITEM::duplicatePinError,
 
                  ERC_ITEM::heading_conflicts,
                  ERC_ITEM::duplicateReference,
diff --git a/eeschema/schematic.cpp b/eeschema/schematic.cpp
index d33881ace7..1813fe7bb4 100644
--- a/eeschema/schematic.cpp
+++ b/eeschema/schematic.cpp
@@ -316,6 +316,12 @@ std::vector<SCH_MARKER*> SCHEMATIC::ResolveERCExclusions()
     {
         SCH_MARKER* testMarker = SCH_MARKER::DeserializeFromString( this, *it );
 
+        if( !testMarker )
+        {
+            it = settings.m_ErcExclusions.erase( it );
+            continue;
+        }
+
         if( testMarker->IsLegacyMarker() )
         {
             const wxString settingsKey = testMarker->GetRCItem()->GetSettingsKey();