diff --git a/.bash_profile b/.bash_profile
index 884d8cd..76f32ad 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,3 +1,5 @@
+# shellcheck disable=SC2155
+
 # XDG base directories
 export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
@@ -24,7 +26,6 @@ export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
 export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
 export CUDA_CACHE_PATH="$XDG_CACHE_HOME/nv"
-export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
 
 # Other program settings
 export SVDIR="$XDG_CONFIG_HOME/service"
diff --git a/.xinitrc b/.xinitrc
index 0148bbc..acc6b27 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -3,8 +3,8 @@
 # shellcheck disable=SC1091
 
 # Startup services and programs
-. "$XDG_DATA_HOME/screenlayout"
-xwallpaper --zoom "$XDG_DATA_HOME/wallpaper"
+[ -f "$XDG_DATA_HOME/screenlayout" ] && . "$XDG_DATA_HOME/screenlayout"
+[ -f "$XDG_DATA_HOME/wallpaper" ] && xwallpaper --zoom "$XDG_DATA_HOME/wallpaper"
 xrdb "$HOME/.Xresources"
 runsvdir "$SVDIR" &