diff --git a/ChangeLog b/ChangeLog
index c7ede80ba3..9da3491b5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-12  Sven Neumann  <sven@gimp.org>
+
+	* libgimpconfig/gimpconfig-path.c (gimp_config_path_expand_only):
+	set the error in the GIMP_CONFIG_ERROR domain.
+
 2008-11-12  Sven Neumann  <sven@gimp.org>
 
 	* libgimpmodule/gimpmodule.[ch]: added GIMP_MODULE_ERROR domain.
diff --git a/libgimpconfig/gimpconfig-path.c b/libgimpconfig/gimpconfig-path.c
index 547e08c247..890c061b8f 100644
--- a/libgimpconfig/gimpconfig-path.c
+++ b/libgimpconfig/gimpconfig-path.c
@@ -29,6 +29,7 @@
 
 #include "libgimpbase/gimpbase.h"
 
+#include "gimpconfig-error.h"
 #include "gimpconfig-path.h"
 
 #include "libgimp/libgimp-intl.h"
@@ -374,7 +375,8 @@ gimp_config_path_expand_only (const gchar  *path,
 
           if (!s)
             {
-              g_set_error (error, 0, 0, _("Cannot expand ${%s}"), token);
+              g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+			   _("Cannot expand ${%s}"), token);
               g_free (token);
               goto cleanup;
             }