diff --git a/eeschema/sch_eagle_plugin.cpp b/eeschema/sch_eagle_plugin.cpp
index 303c9a4aa7..de55549054 100644
--- a/eeschema/sch_eagle_plugin.cpp
+++ b/eeschema/sch_eagle_plugin.cpp
@@ -674,6 +674,7 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
     if( descriptionNode )
     {
         des = descriptionNode->GetContent();
+        des.Replace( "\n", "_", true );
         m_currentSheet->SetName( des );
         filename = des.ToStdString();
     }
diff --git a/eeschema/symbol_tree_synchronizing_adapter.cpp b/eeschema/symbol_tree_synchronizing_adapter.cpp
index 8d432482d4..e1d9fab25d 100644
--- a/eeschema/symbol_tree_synchronizing_adapter.cpp
+++ b/eeschema/symbol_tree_synchronizing_adapter.cpp
@@ -223,7 +223,14 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataVie
 
     case 1:
         if( node->LibId == m_libMgr->GetCurrentLibId() )
-            aVariant = m_libMgr->GetAlias( node->Name, node->Parent->Name )->GetDescription();
+        {
+            auto alias = m_libMgr->GetAlias( node->Name, node->Parent->Name );
+
+            if( alias )
+                aVariant = alias->GetDescription();
+            else
+                aVariant = node->Desc;
+        }
         else
             aVariant = node->Desc;
         break;