diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 4c7dde2b2..b03be5766 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 18:38:47 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* capplet-util.c (capplet_init): Only call
+	set_translation_domain() if the context is non-NULL
+
 Fri Oct 24 18:29:14 2008  Søren Sandmann  <sandmann@redhat.com>
 
 	* capplet-util.c: Call g_option_context_set_translation_domain on
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index 2b5b590e0..e5fdd15b8 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -192,11 +192,10 @@ capplet_init (GOptionContext *context,
 	textdomain (GETTEXT_PACKAGE);
 #endif
 	
-#if GLIB_CHECK_VERSION (2, 12, 0)
-        g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
-#endif
-	
 	if (context) {
+#if GLIB_CHECK_VERSION (2, 12, 0)
+		g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
+#endif
 		g_option_context_add_group (context, gtk_get_option_group (TRUE));
 		
 		if (!g_option_context_parse (context, argc, argv, &err)) {