diff --git a/ChangeLog b/ChangeLog
index ff3eefe5e1..1ef9f32eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-23  Michael Natterer  <mitch@gimp.org>
+
+	* app/plug-in/gimppluginmanager.c (gimp_plug_in_manager_restore):
+	if plug_in_rc_parse() returns an empty list it's not neccessarily
+	an eror, so check the "error" variable before accessing it.
+	Fixes bug #363345.
+
 2006-10-23  Michael Natterer  <mitch@gimp.org>
 
 	* plug-ins/common/plugin-defs.pl
diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c
index 23aba4555b..122a6f0794 100644
--- a/app/plug-in/gimppluginmanager.c
+++ b/app/plug-in/gimppluginmanager.c
@@ -303,7 +303,7 @@ gimp_plug_in_manager_initialize (GimpPlugInManager  *manager,
   gimp_environ_table_load (manager->environ_table, path);
   g_free (path);
 
-  /* allocate a piece of shared memory for use in transporting tiles
+  /*  allocate a piece of shared memory for use in transporting tiles
    *  to plug-ins. if we can't allocate a piece of shared memory then
    *  we'll fall back on sending the data over the pipe.
    */
@@ -382,7 +382,7 @@ gimp_plug_in_manager_restore (GimpPlugInManager  *manager,
 
       g_slist_free (rc_defs);
     }
-  else
+  else if (error)
     {
       if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
         gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);