=== modified file 'common/project.cpp'
--- common/project.cpp	2015-05-03 13:48:05 +0000
+++ common/project.cpp	2015-05-09 19:37:27 +0000
@@ -265,21 +265,25 @@
     wxConfigBase*   cfg = 0;
     wxString        cur_pro_fn = !aProjectFileName ? GetProjectFullName() : aProjectFileName;

-    if( wxFileName( cur_pro_fn ).IsFileReadable() )
-    {
-        // Note: currently, aGroupName is not used.
-        // Previoulsy, the version of aGroupName was tested, but it
-        // was useless, and if the version is important,
-        // this is not the right place here, because configCreate does know anything
-        // about info stored in this config file.
-        cfg = new wxFileConfig( wxEmptyString, wxEmptyString, cur_pro_fn, wxEmptyString );
-        return cfg;
-    }
-
-    // No suitable pro file was found, either does not exist, or not readable.
-    // Use the template kicad.pro file.  Find it by using caller's SEARCH_STACK.
-    copy_pro_file_template( aSList, cur_pro_fn );
-
+    if( cur_pro_fn.IsEmpty() )
+    {
+        // If no filename given assume default kicad.pro in preferences folder
+        cur_pro_fn = wxFileName( GetKicadConfigPath(), wxT( "kicad" ), ProjectFileExtension ).GetFullPath();
+        DBG( printf( "%s: using '%s'.\n", __func__, TO_UTF8( cur_pro_fn ) ); )
+    }
+
+    if( !wxFileName( cur_pro_fn ).IsFileReadable() )
+    {
+        // No suitable pro file was found, either does not exist, or not readable.
+        // Use the template kicad.pro file.  Find it by using caller's SEARCH_STACK.
+        copy_pro_file_template( aSList, cur_pro_fn );
+    }
+
+    // Note: currently, aGroupName is not used.
+    // Previoulsy, the version of aGroupName was tested, but it
+    // was useless, and if the version is important,
+    // this is not the right place here, because configCreate does know anything
+    // about info stored in this config file.
     cfg = new wxFileConfig( wxEmptyString, wxEmptyString, cur_pro_fn, wxEmptyString );

     return cfg;

=== modified file 'eeschema/dialogs/dialog_eeschema_config.cpp'
--- eeschema/dialogs/dialog_eeschema_config.cpp	2015-04-27 08:44:17 +0000
+++ eeschema/dialogs/dialog_eeschema_config.cpp	2015-05-09 19:04:32 +0000
@@ -97,7 +97,10 @@
     m_lib_list_changed( false ),
     m_lib_path_changed( false )
 {
-    m_ListLibr->InsertItems( *aCallersLibNames, 0 );
+    if( !aCallersLibNames->IsEmpty() )
+    {
+        m_ListLibr->InsertItems( *aCallersLibNames, 0 );
+    }

     // Load user libs paths:
     wxArrayString paths;