diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index f8cf599338..0c8efc66ec 100644
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -748,11 +748,11 @@ void CVPCB_MAINFRAME::DisplayStatus()
 
 bool CVPCB_MAINFRAME::LoadFootprintFiles()
 {
-    // Check if there are footprint libraries in project file.
-    if( m_ModuleLibNames.GetCount() == 0 )
+    // Check if there are footprint libraries in the footprint library table.
+    if( m_footprintLibTable == NULL || m_footprintLibTable->GetCount() == 0 )
     {
-        wxMessageBox( _( "No PCB footprint libraries are listed in the current project file." ),
-                      _( "Project File Error" ), wxOK | wxICON_ERROR );
+        wxMessageBox( _( "No PCB footprint libraries are listed in the current footprint "
+                         "library table." ), _( "Configuration Error" ), wxOK | wxICON_ERROR );
         return false;
     }