Index: openacs-4/packages/xowiki/www/admin/test.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/test.tcl,v
diff -u -r1.40 -r1.41
--- openacs-4/packages/xowiki/www/admin/test.tcl	21 Dec 2017 18:09:41 -0000	1.40
+++ openacs-4/packages/xowiki/www/admin/test.tcl	24 Dec 2017 12:51:38 -0000	1.41
@@ -30,8 +30,11 @@
     list [::xo::cc form_parameter $key {}] 
   }
   proc ::ad_returnredirect url {::xo::cc returnredirect $url}
-  if {[catch {set r [uplevel $cmd]} errmsg]} {
-    if {$errmsg ne ""} {test code "error in command: $errmsg [info exists r]"}
+  
+  ad_try {
+    set r [uplevel $cmd]
+  } on error errmsg} {
+    test code "error in command: $errmsg [info exists r]"
     set r ""
   }
   rename ::ns_queryget ""