diff --git a/common/fp_lib_table.cpp b/common/fp_lib_table.cpp
index 25a4b3896f..85be988ec9 100644
--- a/common/fp_lib_table.cpp
+++ b/common/fp_lib_table.cpp
@@ -327,8 +327,9 @@ const FP_LIB_TABLE_ROW* FP_LIB_TABLE::FindRow( const wxString& aNickname, bool a
 
     if( !row )
     {
-        wxString msg = wxString::Format( _( "fp-lib-table files contain no library named '%s'." ),
-                                         aNickname );
+        // We don't generally show this string to the user (who is unlikely to know what
+        // "fp-lib-table" means), and translating it may produce Sentry KICAD-YP.
+        wxString msg = wxString::Format( wxS( "'%s' not found in fp-lib-table." ), aNickname );
         THROW_IO_ERROR( msg );
     }
 
diff --git a/pcbnew/drc/drc_test_provider_library_parity.cpp b/pcbnew/drc/drc_test_provider_library_parity.cpp
index 7e03b15acf..8c6df37a1f 100644
--- a/pcbnew/drc/drc_test_provider_library_parity.cpp
+++ b/pcbnew/drc/drc_test_provider_library_parity.cpp
@@ -827,6 +827,12 @@ bool DRC_TEST_PROVIDER_LIBRARY_PARITY::Run()
         wxString             fpName = fpID.GetLibItemName();
         const LIB_TABLE_ROW* libTableRow = nullptr;
 
+        if( libName.IsEmpty() )
+        {
+            // Not much we can do here
+            continue;
+        }
+
         try
         {
             libTableRow = libTable->FindRow( libName );