Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -N -r1.90.2.25 -r1.90.2.26
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	4 Feb 2022 13:40:01 -0000	1.90.2.25
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	4 Feb 2022 14:53:37 -0000	1.90.2.26
@@ -310,9 +310,9 @@
 } {
     db_exec_plsql rename_folder {}
     if {!$no_callback_p} {
-        if {![catch {ad_conn package_id} package_id]} {
-            callback fs::folder_edit -package_id $package_id -folder_id $folder_id
-        }
+        callback fs::folder_edit \
+            -package_id [ad_conn package_id] \
+            -folder_id $folder_id
     }
 }
 
@@ -859,9 +859,9 @@
                 -package_id $package_id
 
             if {!$no_callback_p} {
-                if {![catch {ad_conn package_id} package_id]} {
-                    callback fs::file_new -package_id $package_id -file_id $item_id
-                }
+                callback fs::file_new \
+                    -package_id [ad_conn package_id] \
+                    -file_id $item_id
             }
         }
     }
@@ -940,9 +940,9 @@
         }
 
         if {!$no_callback_p} {
-            if {![catch {ad_conn package_id} package_id]} {
-                callback fs::file_new -package_id $package_id -file_id $item_id
-            }
+            callback fs::file_new \
+                -package_id [ad_conn package_id] \
+                -file_id $item_id
         }
     }
     return $revision_id
@@ -1119,9 +1119,10 @@
     }
 
     if {!$no_callback_p} {
-        if {![catch {ad_conn package_id} package_id]} {
-            callback fs::file_revision_new -package_id $package_id -file_id $item_id -parent_id $parent_id
-        }
+        callback fs::file_revision_new \
+            -package_id [ad_conn package_id] \
+            -file_id $item_id \
+            -parent_id $parent_id
     }
 
     return $revision_id
@@ -1152,9 +1153,9 @@
     }
 
     if {!$no_callback_p} {
-        if {![catch {ad_conn package_id} package_id]} {
-            callback fs::file_delete -package_id $package_id -file_id $item_id
-        }
+        callback fs::file_delete \
+            -package_id [ad_conn package_id] \
+            -file_id $item_id
     }
 
     fs::do_notifications \
@@ -1176,9 +1177,9 @@
     Deletes a folder and all contents
 } {
     if {!$no_callback_p} {
-        if {![catch {ad_conn package_id} package_id]} {
-            callback fs::folder_delete -package_id $package_id -folder_id $folder_id
-        }
+        callback fs::folder_delete \
+            -package_id [ad_conn package_id] \
+            -folder_id $folder_id
     }
 
     if {$parent_id eq ""} {