diff --git a/gio/ChangeLog b/gio/ChangeLog
index c65865da0..fc56e5685 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-07  Alexander Larsson  <alexl@redhat.com>
+
+	* glocalfileenumerator.c (_g_local_file_enumerator_new):
+	Avoid warning spew if error == NULL
+	
 2007-12-07  Alexander Larsson  <alexl@redhat.com>
 
 	* gfile.c:
diff --git a/gio/glocalfileenumerator.c b/gio/glocalfileenumerator.c
index 1859d41f3..8d16a86c3 100644
--- a/gio/glocalfileenumerator.c
+++ b/gio/glocalfileenumerator.c
@@ -149,8 +149,11 @@ _g_local_file_enumerator_new (const char           *filename,
   dir = g_dir_open (filename, 0, error != NULL ? &dir_error : NULL);
   if (dir == NULL) 
     {
-      convert_file_to_io_error (error, dir_error);
-      g_error_free (dir_error);
+      if (error != NULL)
+	{
+	  convert_file_to_io_error (error, dir_error);
+	  g_error_free (dir_error);
+	}
       return NULL;
     }