Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.156 -r1.157
--- openacs-4/packages/xowiki/xowiki.info	21 Oct 2017 18:32:26 -0000	1.156
+++ openacs-4/packages/xowiki/xowiki.info	17 Dec 2017 21:07:42 -0000	1.157
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.10.0d3" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d3.apm">
+    <version name="5.10.0d4" url="http://openacs.org/repository/download/apm/xowiki-5.10.0d4.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2017-08-06</release-date>
@@ -55,10 +55,10 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.10.0d3"/>
+        <provides url="xowiki" version="5.10.0d4"/>
         <requires url="acs-datetime" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
-	<requires url="acs-tcl" version="5.9.1"/>
+	<requires url="acs-tcl" version="5.10.0d2"/>
 	<requires url="acs-templating" version="5.9.1"/>
         <requires url="acs-subsite" version="5.9.1"/>
 	<requires url="richtext-ckeditor4" version="0.10"/>
Index: openacs-4/packages/xowiki/tcl/package-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v
diff -u -r1.301 -r1.302
--- openacs-4/packages/xowiki/tcl/package-procs.tcl	23 Oct 2017 10:25:02 -0000	1.301
+++ openacs-4/packages/xowiki/tcl/package-procs.tcl	17 Dec 2017 21:07:42 -0000	1.302
@@ -871,25 +871,56 @@
     csv-dump 1 download 1 list 1
   }
 
-  Package instproc invoke {-method {-error_template error-template} {-batch_mode 0}} {
-    if {![regexp {^[.a-zA-Z0-9_-]+$} $method]} {return [:error_msg "No valid method provided!"] }
-    if {[catch {set page_or_package [:resolve_page ${:object} method]} errorMsg]} {
+  Package instproc invoke {
+    -method
+    {-error_template error-template}
+    {-batch_mode:boolean 0}
+  } {
+    #
+    # Do we have a valid method?
+    #
+    if {![regexp {^[.a-zA-Z0-9_-]+$} $method]} {
+      return [:error_msg "No valid method provided!"]
+    }
+    
+    #
+    # Call the method on the resolved page. This call might trigger an
+    # ad_script_abort, so use ad_try to catch these properly.
+    #
+    ad_try {
+      set page_or_package [:resolve_page ${:object} method]
+    } on error {errorMsg} {
+      #
+      # Report true errors in the error log and return the template.
+      #
       ad_log error $errorMsg
       return [:error_msg -template_file $error_template $errorMsg]
     }
+
+    #
+    # Set the invoke object, such it might be used later
+    #
     ::xo::cc invoke_object $page_or_package
+    
     #my log "--r resolve_page '${:object}' => $page_or_package"
     if {$page_or_package ne ""} {
+      #
+      # Check, of the target is a symbolic link
+      #
       if {[$page_or_package istype ::xowiki::FormPage]
-          && [$page_or_package is_link_page]} {
+          && [$page_or_package is_link_page]
+        } {
+        #
         # If the target is a symbolic link, we may want to call the
         # method on the target. The default behavior is defined in the
         # array delegate_link_to_target, but if can be overruled with
         # the boolean query parameter "deref".
+        #
         set deref [[self class] exists delegate_link_to_target($method)]
         if {[:exists_query_parameter deref]} {
           set deref [:query_parameter deref]
         }
+        
         #my log "invoke on LINK <$method> default deref $deref"
         if {$deref} {
           set target [$page_or_package get_target_from_link_page]