Index: openacs-4/packages/acs-admin/www/send-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/send-email.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-admin/www/send-email.tcl	7 Aug 2017 23:47:45 -0000	1.7
+++ openacs-4/packages/acs-admin/www/send-email.tcl	9 Jan 2018 13:21:00 -0000	1.8
@@ -23,9 +23,18 @@
     return_url:onevalue
 }
 
-if {[catch {acs_mail_lite::send -send_immediately -to_addr $email -from_addr $email_from -subject $subject -body $message} errmsg]} {
-    ad_return_error $error_subject "<p>$error_message</p>
-    <div><code>[ns_quotehtml $errmsg]</code></div>"
+ad_try {
+
+    acs_mail_lite::send \
+        -send_immediately \
+        -to_addr $email \
+        -from_addr $email_from \
+        -subject $subject \
+        -body $message
+
+} on error {errorMsg} {
+    ad_return_error $error_subject "<p>[ns_quotehtml $error_message]</p>
+          <div><code>[ns_quotehtml $errorMsg]</code></div>"
     ad_script_abort
 }
 
Index: openacs-4/packages/acs-admin/www/apm/version-reload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-reload.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-admin/www/apm/version-reload.tcl	7 Aug 2017 23:47:45 -0000	1.12
+++ openacs-4/packages/acs-admin/www/apm/version-reload.tcl	9 Jan 2018 13:21:00 -0000	1.13
@@ -32,7 +32,13 @@
     # Source all of the marked files using the current interpreter, accumulating
     # errors into apm_package_load_errors
     array set errors [list]
-    catch { apm_load_any_changed_libraries errors }
+    ad_try {
+        apm_load_any_changed_libraries errors
+    } on error {errorMsg} {
+        set errHTML "<p>Error during apm_load_any_changed_libraries:</p><pre>[ns_quotehtml $errorMsg]</pre>"
+    } on ok {r} {
+        set errHTML ""
+    }
 
     if {[info exists errors($package_key)]} {
         array set package_errors $errors($package_key)
@@ -80,6 +86,7 @@
         </p>
     "
     }
+    append body $errHTML
 }