Index: openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl,v
diff -u -r1.40.2.1 -r1.40.2.2
--- openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	17 Aug 2015 16:43:54 -0000	1.40.2.1
+++ openacs-4/packages/acs-automated-testing/tcl/aa-test-procs.tcl	18 Aug 2015 12:25:13 -0000	1.40.2.2
@@ -513,8 +513,7 @@
       aa_log \"Running testcase body \$body_count\"
       set catch_val \[catch \"eval \[list \$testcase_body\]\" msg\]
       if {\$catch_val != 0 && \$catch_val != 2} {
-        global errorInfo
-          aa_log_result \"fail\" \"$testcase_id (body \$body_count): Error during execution: \${msg}, stack trace: \n\$errorInfo\"
+          aa_log_result \"fail\" \"$testcase_id (body \$body_count): Error during execution: \${msg}, stack trace: \n\$::errorInfo\"
       }
       incr body_count
     }
@@ -976,23 +975,20 @@
             aa_execute_rollback_tests
 
             if { \$errmsg ne {} && \$errmsg ne \"rollback tests\"\ } {
-                global errorInfo
-                error \"\$errmsg \n\n \$errorInfo\"
+                error \"\$errmsg \n\n \$::errorInfo\"
             }
         "
     }
 
     # Testing
     set setup_error_p [catch {uplevel $test_code} setup_error]
-    global errorInfo
-    set setup_error_stack $errorInfo
+    set setup_error_stack $::errorInfo
 
     # Teardown
     set teardown_error_p 0
     if { $teardown_code ne "" } {
         set teardown_error_p [catch {uplevel $teardown_code} teardown_error]
-        global errorInfo
-        set teardown_error_stack $errorInfo
+        set teardown_error_stack $::errorInfo
     }
 
     # Provide complete error message and stack trace
Index: openacs-4/packages/acs-automated-testing/tcl/http.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/Attic/http.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-automated-testing/tcl/http.tcl	27 Oct 2014 16:39:02 -0000	1.2
+++ openacs-4/packages/acs-automated-testing/tcl/http.tcl	18 Aug 2015 12:25:13 -0000	1.2.2.1
@@ -198,9 +198,8 @@
 proc http::Finish { token {errormsg ""} {skipCB 0}} {
     variable $token
     upvar 0 $token state
-    global errorInfo errorCode
     if {[string length $errormsg] != 0} {
-	set state(error) [list $errormsg $errorInfo $errorCode]
+	set state(error) [list $errormsg $::errorInfo $::errorCode]
 	set state(status) error
     }
     if {[info exists state(connection)] && $state(connection) eq "close"} {
@@ -210,7 +209,7 @@
     if {[info exists state(-command)] && !$skipCB} {
 	if {[catch {eval $state(-command) {$token}} err]} {
 	    if {$errormsg eq ""} {
-		set state(error) [list $err $errorInfo $errorCode]
+		set state(error) [list $err $::errorInfo $::errorCode]
 		set state(status) error
 	    }
 	}
Index: openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl,v
diff -u -r1.8 -r1.8.2.1
--- openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	27 Oct 2014 16:39:02 -0000	1.8
+++ openacs-4/packages/acs-automated-testing/tcl/tclwebtest-procs.tcl	18 Aug 2015 12:25:13 -0000	1.8.2.1
@@ -57,8 +57,7 @@
         # $retry_max times. Propagate the error while retaining the stack trace
         aa_log "twt::do_request failed with error=\"$errmsg\" response_url=\"[tclwebtest::response url]\". See error log for the HTML response body"
         ns_log Error "twt::do_request failed with error=\"$errmsg\" response_url=\"[tclwebtest::response url]\" response_body=\"[tclwebtest::response body]\""
-        global errorInfo
-        error $errmsg $errorInfo
+        error $errmsg $::errorInfo
     }
 }
 
Index: openacs-4/packages/acs-developer-support/www/shell.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/shell.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-developer-support/www/shell.tcl	27 Oct 2014 16:39:34 -0000	1.7
+++ openacs-4/packages/acs-developer-support/www/shell.tcl	18 Aug 2015 12:29:50 -0000	1.7.2.1
@@ -29,8 +29,7 @@
         set out "You cannot use GET to invoke a script on this page.\nClick OK to resubmit the form as a POST."
     } else {
         if {[catch {set out [uplevel 1 [string map {"\\\r\n" " "} $script]]}]} {
-            global errorInfo
-            set out "ERROR:\n$errorInfo"
+            set out "ERROR:\n$::errorInfo"
         }
     }
 }