diff --git a/app/controllers/active_storage/disk_controller_decorator.rb b/app/controllers/active_storage/disk_controller_decorator.rb
index 0b2cf340..50ef2815 100644
--- a/app/controllers/active_storage/disk_controller_decorator.rb
+++ b/app/controllers/active_storage/disk_controller_decorator.rb
@@ -45,7 +45,7 @@ module ActiveStorage
               checksum = token[:checksum]
             end
 
-            named_disk_service(token[:service_name]).upload token[:key], body, checksum: checksum
+            named_disk_service(site.name).upload token[:key], body, checksum: checksum
 
             site.static_files.attach(blob)
           else
@@ -54,7 +54,9 @@ module ActiveStorage
         else
           head :not_found
         end
-      rescue ActiveStorage::IntegrityError
+      rescue ActiveRecord::ActiveRecordError, ActiveStorage::Error => e
+        ExceptionNotifier.notify_exception(e, data: { token: })
+
         head :unprocessable_entity
       end