Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v
diff -u -N -r1.10.10.7 -r1.10.10.8
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	5 Aug 2014 09:49:24 -0000	1.10.10.7
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	10 Sep 2014 08:19:36 -0000	1.10.10.8
@@ -221,7 +221,7 @@
 
     if { [llength $party_option_list] == 0 } {
 	ad_return_template add-no-valid-parties
-	ad_return
+	return
     }
     
     template::element create add_relation party_id \
Index: openacs-4/packages/dotlrn/www/admin/unarchive.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/unarchive.tcl,v
diff -u -N -r1.3 -r1.3.2.1
Binary files differ
Index: openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.tcl,v
diff -u -N -r1.1.1.1 -r1.1.1.1.22.1
--- openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.tcl	17 Feb 2003 20:56:16 -0000	1.1.1.1
+++ openacs-4/packages/dotlrn-homework/www/dotlrn-homework-admin-portlet.tcl	10 Sep 2014 08:17:28 -0000	1.1.1.1.22.1
@@ -25,7 +25,7 @@
 
 if {$n_folders != 1} {
     # something went wrong, we can't have more than one folder here
-    ad_return -error
+    return -code error "more than one folder"
 }
 set folder_id [lindex $list_of_folder_ids 0]
 
Index: openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl,v
diff -u -N -r1.2.12.1 -r1.2.12.2
--- openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl	18 Aug 2014 21:53:42 -0000	1.2.12.1
+++ openacs-4/packages/dotlrn-homework/www/dotlrn-homework-portlet.tcl	10 Sep 2014 08:17:28 -0000	1.2.12.2
@@ -21,13 +21,13 @@
 
 if {$n_folders != 1} {
     # something went wrong, we can't have more than one folder here
-    ad_return -error
+    return -code error "can't have more than one folder"
 }
 set folder_id [lindex $list_of_folder_ids 0]
 
 # Make sure our visitor can read the folder.
 if { ![permission::permission_p -object_id $folder_id -privilege "read"] } {
-    ad_return -error
+    return -code error "visitor can't read folder"
 }
 
 # No need to do any more work if the shade's pulled up
Index: openacs-4/packages/dotlrn-homework/www/folder-contents.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-contents.tcl,v
diff -u -N -r1.4.12.3 -r1.4.12.4
--- openacs-4/packages/dotlrn-homework/www/folder-contents.tcl	23 Aug 2014 13:01:26 -0000	1.4.12.3
+++ openacs-4/packages/dotlrn-homework/www/folder-contents.tcl	10 Sep 2014 08:17:29 -0000	1.4.12.4
@@ -28,7 +28,7 @@
 
 # Make sure our visitor can read and write to the folder.
 if { ![permission::permission_p -object_id $folder_id -privilege "read"] } {
-    ad_return -error
+    return -code error "visitor can't read folder"
 }
 
 set list_of_folder_ids [list $folder_id]
Index: openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl,v
diff -u -N -r1.8.12.1 -r1.8.12.2
--- openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	19 Aug 2014 16:52:37 -0000	1.8.12.1
+++ openacs-4/packages/fs-portlet/www/fs-contents-portlet.tcl	10 Sep 2014 08:18:14 -0000	1.8.12.2
@@ -41,7 +41,7 @@
 
 if {$n_folders != 1} {
     # something went wrong, we can't have more than one folder here
-    ad_return -error
+    return -code error "can't have more than one folder"
 }
 
 # Get the root folder for the file storage instance we belong to, which is defined as the
Index: openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl,v
diff -u -N -r1.6 -r1.6.8.1
--- openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl	8 Aug 2006 21:27:00 -0000	1.6
+++ openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.tcl	10 Sep 2014 08:18:14 -0000	1.6.8.1
@@ -32,7 +32,7 @@
     # be shown in the content of the portlet. This is for errors other
     # than with the "show" proc. 
     ns_log error "\n\n *** Error in portal/www/render_sytles/all_in_one/render-element.tcl \n Uncaught exception when calling portal::evaluate_element \n with element_id $element_id\n\n ERROR $errmsg"
-    ad_return -code error
+    return -code error "error during rendering portal element $element_id"
 } else {
     # all is ok
     array set element $element_data