diff --git a/assets/src/components/files/Listing.vue b/assets/src/components/files/Listing.vue
index cb4e818d..5878b95e 100644
--- a/assets/src/components/files/Listing.vue
+++ b/assets/src/components/files/Listing.vue
@@ -275,6 +275,10 @@ export default {
       this.checkConflict(files, this.req.items, base)
     },
     checkConflict (files, items, base) {
+      if (typeof items === 'undefined' || items === null) {
+        items = []
+      }
+
       let conflict = false
       for (let i = 0; i < files.length; i++) {
         let res = items.findIndex(function hasConflict (element) {
diff --git a/rice-box.go.REMOVED.git-id b/rice-box.go.REMOVED.git-id
index 7d218215..1f0e95ec 100644
--- a/rice-box.go.REMOVED.git-id
+++ b/rice-box.go.REMOVED.git-id
@@ -1 +1 @@
-089544d63f4f1d633c2e2baa961a8958d1d768e4
\ No newline at end of file
+1f3ae0f4595621cd6a7492418bafc23660342685
\ No newline at end of file