Index: openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl	28 Jun 2015 12:09:34 -0000	1.3
+++ openacs-4/packages/dotlrn-admin/www/admin/password-update-2.tcl	21 Jan 2018 00:38:38 -0000	1.4
@@ -34,28 +34,38 @@
 set email [acs_user::get_element -user_id $user_id -element email]
 
 # Send email
-if {[catch {acs_mail_lite::send -to_addr $email -from_addr $system_owner -subject $subject -body $body} errmsg]} {
-	ns_log Error "[_ dotlrn.lt_Error_sending_email_t]" $errmsg
-	ad_return_error \
-        "[_ dotlrn.Error_sending_mail]" \
-        "[_ dotlrn.lt_There_was_an_error_se]" 
-} else {
+ad_try {
+    acs_mail_lite::send \
+	-to_addr $email \
+	-from_addr $system_owner \
+	-subject $subject \
+	-body $body
+} on error {errorMsg} {
+    ns_log Error "[_ dotlrn.lt_Error_sending_email_t] $errorMsg"
+    ad_return_error \
+	"[_ dotlrn.Error_sending_mail]" \
+	"[_ dotlrn.lt_There_was_an_error_se]"
+    ad_script_abort
+}
 
-    set system_name [ad_system_name]
-    set admin_subject "[_ dotlrn.lt_The_following_email_w]"
-    set admin_message "[_ dotlrn.lt_The_following_email_w_1]"
+set system_name [ad_system_name]
+set admin_subject "[_ dotlrn.lt_The_following_email_w]"
+set admin_message "[_ dotlrn.lt_The_following_email_w_1]"
 
-
-    if {[catch {acs_mail_lite::send -to_addr $system_owner -from_addr $system_owner -subject $admin_subject -body $admin_message} errmsg]} {
-	
-	ns_log Error "Error sending email from password-update-2.tcl" $errmsg
-	ad_return_error \
-		"[_ dotlrn.Error_sending_mail]" \
-		"[_ dotlrn.lt_There_was_an_error_se_1]"
-    }
+ad_try {
+    acs_mail_lite::send \
+	-to_addr $system_owner \
+	-from_addr $system_owner \
+	-subject $admin_subject \
+	-body $admin_message
+} on error {errorMsg} {
+    ns_log Error "Error sending email from password-update-2.tcl $errorMsg"
+    ad_return_error \
+	"[_ dotlrn.Error_sending_mail]" \
+	"[_ dotlrn.lt_There_was_an_error_se_1]"
+    ad_script_abort
 }
 
-
 if {$return_url eq ""} {
     set return_url "user?user_id=$user_id"
 }