diff --git a/eeschema/sch_symbol.cpp b/eeschema/sch_symbol.cpp
index b0094dbc72..0356daf8a0 100644
--- a/eeschema/sch_symbol.cpp
+++ b/eeschema/sch_symbol.cpp
@@ -35,6 +35,7 @@
 #include <trigo.h>
 #include <refdes_utils.h>
 #include <wx/log.h>
+#include <wx/debug.h>
 #include <settings/settings_manager.h>
 #include <sch_plotter.h>
 #include <string_utils.h>
@@ -230,7 +231,11 @@ wxString SCH_SYMBOL::GetSchSymbolLibraryName() const
 
 void SCH_SYMBOL::SetLibSymbol( const LIB_SYMBOL* aLibSymbol )
 {
-    wxASSERT_MSG( aLibSymbol, wxT( "SCH_SYMBOL::SetLibSymbol() called with NULL pointer" ) );
+    if( !aLibSymbol )
+    {
+        wxFAIL_MSG( "SCH_SYMBOL::SetLibSymbol() called with NULL pointer" );
+        aLibSymbol = LIB_SYMBOL::Dummy();
+    }
 
     m_part.reset( aLibSymbol->Flatten().release() );
     m_part->SetParent();