diff --git a/swh/loader/package/loader.py b/swh/loader/package/loader.py
--- a/swh/loader/package/loader.py
+++ b/swh/loader/package/loader.py
@@ -313,20 +313,23 @@
                             # memory
                             objects = directory.collect()
 
-                            contents = objects['content'].values()
-                            logger.debug('Number of contents: %s',
-                                         len(contents))
-
-                            self.storage.content_add(
-                                [content_for_storage(x) for x in contents])
-
-                            status_load = 'eventful'
-                            directories = list(objects['directory'].values())
-
-                            logger.debug('Number of directories: %s',
-                                         len(directories))
-
-                            self.storage.directory_add(directories)
+                            _contents = objects.get('content')
+                            if _contents:
+                                contents = _contents.values()
+                                logger.debug('Number of contents: %s',
+                                             len(contents))
+                                self.storage.content_add(
+                                    [content_for_storage(x) for x in contents])
+
+                                status_load = 'eventful'
+
+                            _directories = objects.get('directory')
+                            if _directories:
+                                directories = list(_directories.values())
+                                logger.debug('Number of directories: %s',
+                                             len(directories))
+                                status_load = 'eventful'
+                                self.storage.directory_add(directories)
 
                             # FIXME: This should be release. cf. D409
                             revision = self.build_revision(