diff --git a/ChangeLog b/ChangeLog
index 13f5d860b3..aebf705c6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-07-19  Matthias Clasen  <mclasen@redhat.com>
 
+	* modules/printbackends/file/gtkprintbackendfile.c 
+	(file_printer_get_settings_from_options): Check if option
+	is NULL before using it.  (#348014, Christian Persch)
+
 	* gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
 	up a font XID, add the XID_FONT_BIT.  (#348001)
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 13f5d860b3..aebf705c6e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-07-19  Matthias Clasen  <mclasen@redhat.com>
 
+	* modules/printbackends/file/gtkprintbackendfile.c 
+	(file_printer_get_settings_from_options): Check if option
+	is NULL before using it.  (#348014, Christian Persch)
+
 	* gdk/x11/gdkx.h (gdk_font_lookup_for_display): When looking
 	up a font XID, add the XID_FONT_BIT.  (#348001)
 
diff --git a/modules/printbackends/file/gtkprintbackendfile.c b/modules/printbackends/file/gtkprintbackendfile.c
index 0ee09dfc7c..36f0fcc89e 100644
--- a/modules/printbackends/file/gtkprintbackendfile.c
+++ b/modules/printbackends/file/gtkprintbackendfile.c
@@ -540,7 +540,8 @@ file_printer_get_settings_from_options (GtkPrinter          *printer,
   gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_URI, option->value);
 
   option = gtk_printer_option_set_lookup (options, "output-file-format");
-  gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT, option->value);
+  if (option)
+    gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT, option->value);
 }
 
 static void