diff --git a/gio/ChangeLog b/gio/ChangeLog
index 461e55bb2..8fe4b8203 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-06  Alexander Larsson  <alexl@redhat.com>
+
+	* gfile.c (g_file_query_exists):
+	Add g_return_val_if_fail check (#520700)
+
 2008-03-06  Alexander Larsson  <alexl@redhat.com>
 
         * gdesktopappinfo.c:
diff --git a/gio/gfile.c b/gio/gfile.c
index ddc0ce4ff..9a3f034fc 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -928,7 +928,9 @@ g_file_query_exists (GFile *file,
 		     GCancellable *cancellable)
 {
   GFileInfo *info;
-
+  
+  g_return_val_if_fail (G_IS_FILE(file), FALSE);
+  
   info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE,
 			    G_FILE_QUERY_INFO_NONE,
 			    cancellable, NULL);