diff --git a/swh/loader/svn/loader.py b/swh/loader/svn/loader.py
--- a/swh/loader/svn/loader.py
+++ b/swh/loader/svn/loader.py
@@ -10,12 +10,11 @@
 import os
 import pty
 import re
-import shutil
-import tempfile
-
 from mmap import mmap, ACCESS_WRITE
+import shutil
 from subprocess import Popen
-from typing import Iterator, List, Tuple
+import tempfile
+from typing import Iterator, Optional, List, Tuple
 
 from swh.model import hashutil
 from swh.model.model import (
@@ -534,14 +533,16 @@
                 snapshot=self._snapshot
             )
             self.flush()
-            self.storage.origin_visit_update(
-                self.origin.url, self.visit, snapshot=snapshot.id)
+            if snapshot:
+                self.storage.origin_visit_update(
+                    self.origin.url, self.visit, snapshot=snapshot.id)
 
         self._contents = []
         self._directories = []
         self._revisions = []
 
-    def generate_and_load_snapshot(self, revision=None, snapshot=None):
+    def generate_and_load_snapshot(
+            self, revision=None, snapshot=None) -> Optional[Snapshot]:
         """Create the snapshot either from existing revision or snapshot.
 
         Revision (supposedly new) has priority over the snapshot
@@ -552,7 +553,7 @@
             snapshot (dict): Snapshot to use if any (None by default)
 
         Returns:
-            dict: The newly created snapshot
+            The newly created snapshot
 
         """
         if revision:  # Priority to the revision