diff --git a/eeschema/fields_grid_table.cpp b/eeschema/fields_grid_table.cpp
index 8731966d8f..a8cdd91f96 100644
--- a/eeschema/fields_grid_table.cpp
+++ b/eeschema/fields_grid_table.cpp
@@ -309,7 +309,9 @@ wxGridCellAttr* FIELDS_GRID_TABLE<T>::GetAttr( int aRow, int aCol, wxGridCellAtt
             wxString fn = GetValue( aRow, FDC_NAME );
 
             SCHEMATIC_SETTINGS* settings = m_frame->Prj().GetProjectFile().m_SchematicSettings;
-            const TEMPLATE_FIELDNAME* templateFn = settings->m_TemplateFieldNames.GetFieldName( fn );
+
+            const TEMPLATE_FIELDNAME* templateFn =
+                    settings ? settings->m_TemplateFieldNames.GetFieldName( fn ) : nullptr;
 
             if( templateFn && templateFn->m_URL )
             {
diff --git a/pcbnew/pcb_shape.h b/pcbnew/pcb_shape.h
index f263ed2a9e..48c1a95f96 100644
--- a/pcbnew/pcb_shape.h
+++ b/pcbnew/pcb_shape.h
@@ -106,6 +106,9 @@ public:
         case S_ARC:
         case S_CURVE:
             return false;
+
+        case S_LAST:    // Sentinel
+            break;
         }
 
         return false;   // Make compil happy