diff --git a/swh/storage/storage.py b/swh/storage/storage.py
index 6b52485..44f3df9 100644
--- a/swh/storage/storage.py
+++ b/swh/storage/storage.py
@@ -894,10 +894,9 @@ class Storage:
             updates["snapshot"] = snapshot
 
         if updates:
-            updated_visit = OriginVisit.from_dict({**visit, **updates})
-            self.journal_writer.origin_visit_update(updated_visit)
-
             with convert_validation_exceptions():
+                updated_visit = OriginVisit.from_dict({**visit, **updates})
+                self.journal_writer.origin_visit_update(updated_visit)
                 db.origin_visit_update(origin_url, visit_id, updates, cur)