Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	1 Oct 2017 12:16:05 -0000	1.20
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	21 Jan 2018 00:38:38 -0000	1.21
@@ -60,7 +60,7 @@
     }
 }
 
-if {[catch {
+ad_try {
     acs_user::change_state -user_id $user_id -state $member_state
 
     switch -- $email_verified_p {
@@ -71,9 +71,10 @@
             db_exec_plsql unapprove_email {}
         }
     }
-} errmsg]} {
+} on error {errorMsg} {
     ad_return_error "Database Update Failed" "Database update failed with the following error:
-    <pre>$errmsg</pre>"
+    <pre>[ns_quotehtml $errorMsg]</pre>"
+    ad_script_abort
 }
 
 callback acs_admin::member_state_change -member_state $member_state -user_id $user_id