diff --git a/eeschema/sch_symbol.cpp b/eeschema/sch_symbol.cpp
index 7864a01028..0a5367c5de 100644
--- a/eeschema/sch_symbol.cpp
+++ b/eeschema/sch_symbol.cpp
@@ -1315,7 +1315,9 @@ bool SCH_SYMBOL::ResolveTextVar( const SCH_SHEET_PATH* aPath, wxString* token, i
 
         std::vector<EMBEDDED_FILES*> embeddedFilesStack;
         embeddedFilesStack.push_back( schematic->GetEmbeddedFiles() );
-        embeddedFilesStack.push_back( GetLibSymbolRef()->GetEmbeddedFiles() );
+
+        if( m_part )
+            embeddedFilesStack.push_back( m_part->GetEmbeddedFiles() );
 
         simLibMgr.SetFilesStack( embeddedFilesStack );