diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 19157bb..bc58e85 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -239,7 +239,7 @@ exec --no-startup-id envsubst < ~/.config/dunst/dunstrc.template > ~/.config/dun
 
 # Pulseaudio
 ## Necessary if you have no DE (gnome, xfce, etc...) under i3.
-exec pulseaudio --kill && pulseaudio --start
+exec --no-startup-id pulseaudio --kill && sleep 1 && pulseaudio --start
 
 # Nextcloud Desktop
 #exec --no-startup-id nextcloud
diff --git a/x/.xinitrc b/x/.xinitrc
index 80ff906..c5cb6fb 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 # This file is used by xinit and its wrapper startx.
 # Display managers like xdm doesn't use this file at all
 #
@@ -20,11 +22,14 @@ fi
 #       consequences of removing them.
 # run all system xinitrc shell scripts.
 if [ -d /etc/X11/Xsession.d ]; then
-    for i in /etc/X11/Xsession.d/* ; do
-        if [ -x "$i" ]; then
-      . "$i"
-        fi
-    done
+    SESSIONFILES=$(run-parts --list /etc/X11/Xsession.d)
+    if [ -n "$SESSIONFILES" ]; then
+        set +e
+        for SESSIONFILE in $SESSIONFILES; do
+            . $SESSIONFILE
+        done
+        set -e
+    fi
 fi
 
 # To avoid very solw startup of many GTK apps