diff --git a/ChangeLog b/ChangeLog
index 86e9ae198..f6bad0a18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-12  Alexander Larsson  <alexl@redhat.com>
+
+        * libnautilus-private/nautilus-file-operations.c:
+        (copy_job_done):
+	desktop_location can be NULL, check before unrefing
+
 2009-03-12  Alexander Larsson  <alexl@redhat.com>
 
 	Bug 550250 – nautilus crashed with SIGSEGV in g_type_check_instance_cast()
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 57826261e..d1a92f110 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -4302,7 +4302,9 @@ copy_job_done (gpointer user_data)
 	if (job->destination) {
 		g_object_unref (job->destination);
 	}
-	g_object_unref (job->desktop_location);
+	if (job->desktop_location) {
+		g_object_unref (job->desktop_location);
+	}
 	g_hash_table_unref (job->debuting_files);
 	g_free (job->icon_positions);