diff --git a/eeschema/symbol_viewer_frame.cpp b/eeschema/symbol_viewer_frame.cpp
index 65130610f5..a61979d448 100644
--- a/eeschema/symbol_viewer_frame.cpp
+++ b/eeschema/symbol_viewer_frame.cpp
@@ -815,7 +815,7 @@ bool SYMBOL_VIEWER_FRAME::ReCreateSymbolList()
 
     for( const LIB_SYMBOL* symbol : symbols )
     {
-        if( row->SupportsSubLibraries()
+        if( row && row->SupportsSubLibraries()
             && !subLib.IsSameAs( symbol->GetLibId().GetSubLibraryName() ) )
         {
             continue;
diff --git a/pcbnew/widgets/pcb_properties_panel.cpp b/pcbnew/widgets/pcb_properties_panel.cpp
index 0adf68ed3a..61f1947e43 100644
--- a/pcbnew/widgets/pcb_properties_panel.cpp
+++ b/pcbnew/widgets/pcb_properties_panel.cpp
@@ -68,6 +68,10 @@ PCB_PROPERTIES_PANEL::PCB_PROPERTIES_PANEL( wxWindow* aParent, PCB_EDIT_FRAME* a
         PG_CHECKBOX_EDITOR* cbEditor = new PG_CHECKBOX_EDITOR();
         m_checkboxEditorInstance = static_cast<PG_CHECKBOX_EDITOR*>( wxPropertyGrid::RegisterEditorClass( cbEditor ) );
     }
+    else
+    {
+        m_checkboxEditorInstance = static_cast<PG_CHECKBOX_EDITOR*>( it->second );
+    }
 }