Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v
diff -u -r1.78.2.32 -r1.78.2.33
--- openacs-4/packages/acs-tcl/tcl/security-procs.tcl	29 Sep 2016 21:24:19 -0000	1.78.2.32
+++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl	11 Nov 2016 17:05:32 -0000	1.78.2.33
@@ -73,6 +73,17 @@
     db_release_unused_handles
 }
 
+ad_proc -private sec_handler_reset {} {
+
+    provide dummy values for global variables provided by the
+    sec_handler, in case, the sec_handler is not called or runs into
+    an exception.
+    
+} {
+    set ::__csp_nonce ""
+    set ::__csrf_token ""
+}
+
 ad_proc -private sec_handler {} {
 
     Reads the security cookies, setting fields in ad_conn accordingly.