diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index a48f980526..fe818bd8cb 100644
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -799,6 +799,15 @@ int CVPCB_MAINFRAME::ReadSchematicNetlist()
     wxString        compFootprintLinkFileName;
     wxFileName      fn = m_NetlistFileName;
 
+    // Ensure the netlist file exists, and wran the user if not:
+    if( ! wxFileExists( m_NetlistFileName.GetFullPath() ) )
+    {
+        msg.Printf( _( "Unable to find netlist file:\n'%s'\n\nPlease, create it" ),
+                       GetChars( m_NetlistFileName.GetFullPath() ) );
+        wxMessageBox( msg, _( "Netlist Load Error" ), wxOK | wxICON_ERROR );
+        return 1;
+    }
+
     // Load the footprint association file if it has already been created.
     fn.SetExt( ComponentFileExtension );
 
diff --git a/eeschema/dialogs/dialog_lib_edit_pin.cpp b/eeschema/dialogs/dialog_lib_edit_pin.cpp
index 4909c9e37e..15954dd27a 100644
--- a/eeschema/dialogs/dialog_lib_edit_pin.cpp
+++ b/eeschema/dialogs/dialog_lib_edit_pin.cpp
@@ -51,9 +51,11 @@ DIALOG_LIB_EDIT_PIN::DIALOG_LIB_EDIT_PIN( EDA_DRAW_FRAME* parent, LIB_PIN* aPin
     m_sdbSizerButtonsOK->SetDefault();
 
     GetSizer()->SetSizeHints( this );
-    Raise();    // On Unity, ans some other windows manager,
-                // this dialog is not always shown,
-                // depending on this dialog is run. Force it to be shown
+
+    // On some windows manager (Unity, XFCE), this dialog is
+    // not always raised, depending on this dialog is run.
+    // Force it to be raised
+    Raise();
 }
 
 
diff --git a/pcbnew/dialogs/dialog_fp_lib_table.cpp b/pcbnew/dialogs/dialog_fp_lib_table.cpp
index 7f1b116cc8..986b9367e6 100644
--- a/pcbnew/dialogs/dialog_fp_lib_table.cpp
+++ b/pcbnew/dialogs/dialog_fp_lib_table.cpp
@@ -369,6 +369,11 @@ public:
 
         // for ALT+A handling, we want the initial focus to be on the first selected grid.
         m_cur_grid->SetFocus();
+
+        // On some windows manager (Unity, XFCE), this dialog is
+        // not always raised, depending on this dialog is run.
+        // Force it to be raised
+        Raise();
     }
 
     ~DIALOG_FP_LIB_TABLE()