diff --git a/backend/src/app/features/components_v2.clj b/backend/src/app/features/components_v2.clj
index c09e7251de..915d08ab6e 100644
--- a/backend/src/app/features/components_v2.clj
+++ b/backend/src/app/features/components_v2.clj
@@ -945,6 +945,12 @@
                              :file-id (str (:id fdata))
                              :id (str (:id mobj)))
 
+                      (instance? org.graalvm.polyglot.PolyglotException cause)
+                      (l/inf :hint "skip processing media object: invalid svg found"
+                             :team-id (str team-id)
+                             :file-id (str (:id fdata))
+                             :id (str (:id mobj)))
+
                       (= (:type edata) :not-found)
                       (l/inf :hint "skip processing media object: underlying object does not exist"
                              :team-id (str team-id)
diff --git a/backend/src/app/srepl/components_v2.clj b/backend/src/app/srepl/components_v2.clj
index 5cc30fadfa..4b042883f4 100644
--- a/backend/src/app/srepl/components_v2.clj
+++ b/backend/src/app/srepl/components_v2.clj
@@ -287,7 +287,7 @@
         sprocs    (ps/create :permits max-procs)
 
         cache     (if (int? cache)
-                    (cache/create :executor :same-thread
+                    (cache/create :executor executor
                                   :max-items cache)
                     nil)
         migrate-team
@@ -303,14 +303,14 @@
                                                 :skip-on-graphics-error? skip-on-graphic-error?)))
 
               (when (string? label)
-                (report! main/system label team-id (tpoint) nil))
+                (report! main/system team-id label (tpoint) nil))
 
               (catch Throwable cause
                 (l/wrn :hint "unexpected error on processing team (skiping)"
                        :team-id (str team-id)
                        :cause cause)
                 (when (string? label)
-                  (report! main/system label team-id (tpoint) (ex-message cause))))
+                  (report! main/system team-id label (tpoint) (ex-message cause))))
 
               (finally
                 (ps/release! sjobs)))))