diff --git a/eeschema/symbol_editor/symbol_editor.cpp b/eeschema/symbol_editor/symbol_editor.cpp
index be8677555f..aaa27d0dd8 100644
--- a/eeschema/symbol_editor/symbol_editor.cpp
+++ b/eeschema/symbol_editor/symbol_editor.cpp
@@ -726,10 +726,10 @@ void SYMBOL_EDIT_FRAME::UpdateAfterSymbolProperties( wxString* aOldName )
     wxString  msg;
     wxString  lib = GetCurLib();
 
-    if( aOldName && *aOldName != m_my_part->GetName() )
+    if( !lib.IsEmpty() && aOldName && *aOldName != m_my_part->GetName() )
     {
         // Test the current library for name conflicts
-        if( !lib.empty() && m_libMgr->PartExists( m_my_part->GetName(), lib ) )
+        if( m_libMgr->PartExists( m_my_part->GetName(), lib ) )
         {
             msg.Printf( _( "The name '%s' conflicts with an existing entry in the library '%s'." ),
                         m_my_part->GetName(),