diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index f00de030839fa20164b8b56bef8f1245fb7637c7..1261a04772a7977a869c77628b1ea1465c05e8ce 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -6125,6 +6125,11 @@ copy_or_move_selection (NautilusFilesView *view,
 
     selection = nautilus_files_view_get_selection_for_file_transfer (view);
 
+    if (selection == NULL)
+    {
+        return;
+    }
+
     gtk_file_dialog_set_title (dialog, title);
     gtk_file_dialog_set_accept_label (dialog, _("_Select"));
 
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
index 99ba940dc312b3d60ecee561901f5f27f6d0ead6..643f4b550a2b42158d5927f3d6b99026c8042772 100644
--- a/src/resources/nautilus.gresource.xml
+++ b/src/resources/nautilus.gresource.xml
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/gnome/nautilus">
     <file compressed="true">ui/nautilus-preferences-dialog.ui</file>
-    <file alias="appdata" compressed="true" preprocess="xml-stripblanks">./../data/org.gnome.Nautilus.metainfo.xml.in.in</file>
+    <file alias="appdata" compressed="true" preprocess="xml-stripblanks">./../data/org.gnome.Nautilus.metainfo.xml.in</file>
     <file compressed="true">ui/nautilus-search-popover.ui</file>
     <file>ui/nautilus-search-types-dialog.ui</file>
     <file>ui/nautilus-app-chooser.ui</file>