diff --git a/gio/ChangeLog b/gio/ChangeLog
index d88c45fed..27cba3511 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-14  Alexander Larsson  <alexl@redhat.com>
+
+	* gfile.c (g_file_monitor_file):
+	Don't set error here, since we fallback to polling monitor.
+
 2008-01-14  Alexander Larsson  <alexl@redhat.com>
 
         * gfile.[ch]:
diff --git a/gio/gfile.c b/gio/gfile.c
index 0d0a5e129..309c1ecf5 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -3322,7 +3322,7 @@ g_file_monitor_file (GFile             *file,
   monitor = NULL;
   
   if (iface->monitor_file)
-    monitor = (* iface->monitor_file) (file, flags, cancellable, error);
+    monitor = (* iface->monitor_file) (file, flags, cancellable, NULL);
 
 /* Fallback to polling */
   if (monitor == NULL)