diff --git a/eeschema/class_libentry.h b/eeschema/class_libentry.h
index 040a6e3048..39451853d8 100644
--- a/eeschema/class_libentry.h
+++ b/eeschema/class_libentry.h
@@ -352,6 +352,8 @@ public:
      */
     LIB_ITEM* GetNextDrawItem( LIB_ITEM* aItem = NULL, KICAD_T aType = TYPE_NOT_INIT );
 
+    size_t GetPinCount() const { return m_drawings.size( LIB_PIN_T ); }
+
     /**
      * Return the next pin object from the draw list.
      *
diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp
index 80c4a49319..021ab1f5e1 100644
--- a/eeschema/sch_component.cpp
+++ b/eeschema/sch_component.cpp
@@ -281,22 +281,22 @@ void SCH_COMPONENT::UpdatePins()
     m_pins.clear();
     m_pinMap.clear();
 
-    if( m_part )
-    {
-        unsigned i = 0;
+    if( !m_part )
+        return;
 
-        for( LIB_PIN* libPin = m_part->GetNextPin(); libPin; libPin = m_part->GetNextPin( libPin ) )
-        {
-            wxASSERT( libPin->Type() == LIB_PIN_T );
+    unsigned i = 0;
 
-            if( libPin->GetConvert() && m_convert && ( m_convert != libPin->GetConvert() ) )
-                continue;
+    for( LIB_PIN* libPin = m_part->GetNextPin(); libPin; libPin = m_part->GetNextPin( libPin ) )
+    {
+        wxASSERT( libPin->Type() == LIB_PIN_T );
 
-            m_pins.push_back( std::unique_ptr<SCH_PIN>( new SCH_PIN( libPin, this ) ) );
-            m_pinMap[ libPin ] = i;
+        if( libPin->GetConvert() && m_convert && ( m_convert != libPin->GetConvert() ) )
+            continue;
 
-            ++i;
-        }
+        m_pins.push_back( std::unique_ptr<SCH_PIN>( new SCH_PIN( libPin, this ) ) );
+        m_pinMap[ libPin ] = i;
+
+        ++i;
     }
 }
 
@@ -1500,47 +1500,51 @@ SEARCH_RESULT SCH_COMPONENT::Visit( INSPECTOR aInspector, void* aTestData,
 void SCH_COMPONENT::GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems,
                                     SCH_SHEET_PATH*      aSheetPath )
 {
-    if( m_part )
+    if( !m_part )
+        return;
+
+    // This should not happen but just in case the pin map size doesn't match the number of
+    // pins in the symbol, update the pin map.
+    wxCHECK2( m_part->GetPinCount() == m_pins.size(), UpdatePins() );
+
+    for( LIB_PIN* pin = m_part->GetNextPin();  pin;  pin = m_part->GetNextPin( pin ) )
     {
-        for( LIB_PIN* pin = m_part->GetNextPin();  pin;  pin = m_part->GetNextPin( pin ) )
-        {
-            wxASSERT( pin->Type() == LIB_PIN_T );
+        wxASSERT( pin->Type() == LIB_PIN_T );
 
-            if( pin->GetUnit() && ( pin->GetUnit() != GetUnitSelection( aSheetPath ) ) )
-                continue;
+        if( pin->GetUnit() && ( pin->GetUnit() != GetUnitSelection( aSheetPath ) ) )
+            continue;
 
-            if( pin->GetConvert() && ( pin->GetConvert() != GetConvert() ) )
-                continue;
+        if( pin->GetConvert() && ( pin->GetConvert() != GetConvert() ) )
+            continue;
+
+        wxPoint pos = GetTransform().TransformCoordinate( pin->GetPosition() ) + m_Pos;
 
-            wxPoint pos = GetTransform().TransformCoordinate( pin->GetPosition() ) + m_Pos;
+        NETLIST_OBJECT* item = new NETLIST_OBJECT();
+        item->m_SheetPathInclude = *aSheetPath;
+        item->m_Comp = m_pins[ m_pinMap.at( pin ) ].get();
+        item->m_SheetPath = *aSheetPath;
+        item->m_Type = NETLIST_ITEM::PIN;
+        item->m_Link = (SCH_ITEM*) this;
+        item->m_ElectricalPinType = pin->GetType();
+        item->m_PinNum = pin->GetNumber();
+        item->m_Label = pin->GetName();
+        item->m_Start = item->m_End = pos;
 
-            NETLIST_OBJECT* item = new NETLIST_OBJECT();
+        aNetListItems.push_back( item );
+
+        if( pin->IsPowerConnection() )
+        {
+            // There is an associated PIN_LABEL.
+            item = new NETLIST_OBJECT();
             item->m_SheetPathInclude = *aSheetPath;
             item->m_Comp = m_pins[ m_pinMap.at( pin ) ].get();
             item->m_SheetPath = *aSheetPath;
-            item->m_Type = NETLIST_ITEM::PIN;
-            item->m_Link = (SCH_ITEM*) this;
-            item->m_ElectricalPinType = pin->GetType();
-            item->m_PinNum = pin->GetNumber();
+            item->m_Type = NETLIST_ITEM::PINLABEL;
             item->m_Label = pin->GetName();
-            item->m_Start = item->m_End = pos;
+            item->m_Start = pos;
+            item->m_End = item->m_Start;
 
             aNetListItems.push_back( item );
-
-            if( pin->IsPowerConnection() )
-            {
-                // There is an associated PIN_LABEL.
-                item = new NETLIST_OBJECT();
-                item->m_SheetPathInclude = *aSheetPath;
-                item->m_Comp = m_pins[ m_pinMap.at( pin ) ].get();
-                item->m_SheetPath = *aSheetPath;
-                item->m_Type = NETLIST_ITEM::PINLABEL;
-                item->m_Label = pin->GetName();
-                item->m_Start = pos;
-                item->m_End = item->m_Start;
-
-                aNetListItems.push_back( item );
-            }
         }
     }
 }
diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp
index 70173ac034..3aebbf212f 100644
--- a/eeschema/sch_screen.cpp
+++ b/eeschema/sch_screen.cpp
@@ -617,8 +617,8 @@ void SCH_SCREEN::UpdateSymbolLinks( REPORTER* aReporter )
                 aReporter->ReportTail( msg, RPT_SEVERITY_INFO );
             }
 
-            // Internal library symbols are flattens so just make a copy.
-            symbol->GetPartRef().reset( new LIB_PART( *it->second ) );
+            // Internal library symbols are already flattened so just make a copy.
+            symbol->SetLibSymbol( new LIB_PART( *it->second ) );
             continue;
         }