diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession
index b9ef15e..94692db 100755
--- a/x2goserver-xsession/etc/Xsession
+++ b/x2goserver-xsession/etc/Xsession
@@ -139,7 +139,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then
 
 	# Set up i18n environment
 	if [ -r /etc/profile.d/lang.sh ]; then
+		set +e
 		. /etc/profile.d/lang.sh
+		set -e
 	fi
 
 	# merge in defaults
@@ -177,7 +179,9 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ]; then
 
 	# run all system xinitrc shell scripts.
 	for file in /etc/x2go/xinitrc.d/* ; do
+		set +e
 		[ -r "$file" ] && . $file
+		set -e
 	done
 
 	# Prefix launch of session with ssh-agent if available and not already running.
-- 
1.7.9.5