Index: openacs-4/packages/acs-lang/www/change-locale.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/change-locale.tcl	28 Oct 2002 12:32:49 -0000	1.2
+++ openacs-4/packages/acs-lang/www/change-locale.tcl	7 Jun 2008 20:28:55 -0000	1.3
@@ -5,6 +5,9 @@
     return_url
 }
 
-lang::user::set_locale $user_locale
-
-ad_returnredirect $return_url
+if { [catch {lang::user::set_locale $user_locale} errmsg] } {
+    ns_log Error "acs-lang/www/change-locale crashed calling lang::user::set_locale with user_locale='$user_locale'\n$errmsg"
+    ad_return_error [_ acs-lang.Error_changing_locale] [_ acs-lang.User_locale_not_set]
+} else {
+    ad_returnredirect $return_url
+}