diff --git a/pandora/edit/models.py b/pandora/edit/models.py
index f0a5abce..86fdc108 100644
--- a/pandora/edit/models.py
+++ b/pandora/edit/models.py
@@ -94,6 +94,8 @@ class Edit(models.Model):
         # dont add clip if in/out are invalid
         if not c.annotation:
             duration = c.item.sort.duration
+            if c.start is None or c.end is None:
+                return False
             if c.start > c.end \
                     or round(c.start, 3) >= round(duration, 3) \
                     or round(c.end, 3) > round(duration, 3):
diff --git a/static/js/folderList.js b/static/js/folderList.js
index d9d6bca7..82aeb9cd 100644
--- a/static/js/folderList.js
+++ b/static/js/folderList.js
@@ -478,7 +478,9 @@ pandora.ui.folderList = function(id, section) {
                 },
                 range: [0, 1]
             }, function(result) {
-                that.value(item, 'items', result.data.items[0].items);
+                if(result.data.items && result.data.items.length) {
+                    that.value(item, 'items', result.data.items[0].items);
+                }
                 callback();
             })
         })