diff --git a/ChangeLog b/ChangeLog
index 17313d7ec6fbb398daf90359bf8a7339a755b605..58382e23b06afbd2ced9f5772799ff66e39128e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-03-30  Alexander Larsson  <alexl@redhat.com>
+
+        * src/file-manager/fm-error-reporting.c:
+        (fm_report_error_loading_directory):
+	Don't show error about not mounted when loading a directory, as
+	this will anyway automaticall trigger a mount operation (and possible
+	error from that).
+
 2009-03-26  Alexander Larsson  <alexl@redhat.com>
 
 	Bug 576761 – fallback icon when icon specified in .desktop doesn't exist is ugly
diff --git a/src/file-manager/fm-error-reporting.c b/src/file-manager/fm-error-reporting.c
index ace6e503a41703cdad4f93c9ac261dd69f035cca..56f85a67c1eb417822be6d61c8b4da0845b083a8 100644
--- a/src/file-manager/fm-error-reporting.c
+++ b/src/file-manager/fm-error-reporting.c
@@ -51,6 +51,12 @@ fm_report_error_loading_directory (NautilusFile *file,
 		return;
 	}
 
+	if (error->domain == G_IO_ERROR &&
+	    error->code == G_IO_ERROR_NOT_MOUNTED) {
+		/* This case is retried automatically */
+		return;
+	}
+	
 	file_name = nautilus_file_get_display_name (file);
 	
 	if (error->domain == G_IO_ERROR) {