diff --git a/ChangeLog b/ChangeLog
index 5c253dc12b..abe907a0ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-10  Cody Russell  <bratsche@gnome.org>
+
+	* gtk/gtkfilechooser.c (gtk_file_chooser_get_current_folder_uri):
+	Check the return value of _gtk_file_chooser_get_file_system () for
+	NULL before passing it to gtk_file_system_path_to_uri ().
+	(#515667, Francesco Montorsi)
+
 2008-02-10  Philip Withnall  <pwithnall@svn.gnome.org>
 
 	* gtk/gtkbuilder.c: Improve the documentation for
diff --git a/gtk/gtkfilechooser.c b/gtk/gtkfilechooser.c
index dbaeba006e..e5e225b932 100644
--- a/gtk/gtkfilechooser.c
+++ b/gtk/gtkfilechooser.c
@@ -1049,6 +1049,9 @@ gtk_file_chooser_get_current_folder_uri (GtkFileChooser *chooser)
   file_system = _gtk_file_chooser_get_file_system (chooser);
 
   path = _gtk_file_chooser_get_current_folder_path (chooser);
+  if (!path)
+    return NULL;
+
   uri = gtk_file_system_path_to_uri (file_system, path);
   gtk_file_path_free (path);