Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.118.2.19 -r1.118.2.20
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	29 May 2016 11:06:20 -0000	1.118.2.19
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	29 May 2016 11:09:25 -0000	1.118.2.20
@@ -740,8 +740,9 @@
     } errorMsg] } {
         ad_log error "language setup failed: $errorMsg"
         ad_return_complaint 1 "invalid language settings"
-        ad_script_abort
-
+        rp_finish_serving_page
+        return "filter_return"
+        
         # acs-lang doesn't seem to be installed. Even though it must be installed now,
         # the problem is that if it isn't, everything breaks. So we wrap it in
         # a catch, and set locale and language to the empty strings.