diff --git a/ChangeLog b/ChangeLog
index 5c5f6166ce..b321063139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-13  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+        Bug 556233 – local-only causes G_IS_FILE warning
+
+        * gtk/gktfilechooserdefault.c (set_local_only): Avoid a warning
+        in tests. Patch by Christian Dywan
+
 2008-12-13  Matthias Clasen  <mclasen@redhat.com>
 
 	Merged from trunk:
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index cd97cc29b1..0b7bbf6250 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5309,7 +5309,8 @@ set_local_only (GtkFileChooserDefault *impl,
 	  shortcuts_add_bookmarks (impl);
 	}
 
-      if (local_only && !g_file_is_native (impl->current_folder))
+      if (local_only && impl->current_folder &&
+          !g_file_is_native (impl->current_folder))
 	{
 	  /* If we are pointing to a non-local folder, make an effort to change
 	   * back to a local folder, but it's really up to the app to not cause