diff --git a/pandora/archive/models.py b/pandora/archive/models.py
index 7423f1f3b..4bbd5da16 100644
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@@ -485,7 +485,7 @@ class File(models.Model):
             'wanted': self.wanted,
         }
         for key in ('folder', 'filename'):
-            if key in keys:
+            if keys and key in keys:
                 data[key] = getattr(self, key)
         if error:
             data['error'] = error