diff --git a/common/footprint_info.cpp b/common/footprint_info.cpp
index 99dde1c4bd..382e141bb3 100644
--- a/common/footprint_info.cpp
+++ b/common/footprint_info.cpp
@@ -275,6 +275,9 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
 
 FOOTPRINT_INFO* FOOTPRINT_LIST::GetModuleInfo( const wxString& aFootprintName )
 {
+    if( aFootprintName.IsEmpty() )
+        return NULL;
+
     BOOST_FOREACH( FOOTPRINT_INFO& fp, m_list )
     {
         FPID fpid;