diff --git a/barrierc/run b/barrierc/run
index 8b15049..e5cea40 100755
--- a/barrierc/run
+++ b/barrierc/run
@@ -7,5 +7,5 @@ if [[ ! -e ${0:a:h}/server ]] then
 	exit 1
 fi
 source ${0:a:h:h}/import-env.zsh
-import-env awesome
+import-env awesome | exit 1
 exec barrierc --no-daemon $(<${0:a:h}/server)
diff --git a/barriers/run b/barriers/run
index deb668d..09c9756 100755
--- a/barriers/run
+++ b/barriers/run
@@ -1,4 +1,4 @@
 #!/bin/zsh
 source ${0:a:h:h}/import-env.zsh
-import-env awesome
+import-env awesome | exit 1
 exec barriers --no-daemon -c ${XDG_CONFIG_HOME:-$HOME/.config}/Debauchee/home.conf
diff --git a/import-env.zsh b/import-env.zsh
index 7412b45..83d6bee 100644
--- a/import-env.zsh
+++ b/import-env.zsh
@@ -1,6 +1,7 @@
 import-env() {
 	SOURCE_PROCESS=$1
 	SOURCE_PID=$(pgrep $SOURCE_PROCESS | head -n 1)
+	if [[ -z $SOURCE_PID ]]; then return 1; fi
 	SOURCE_ENV=("${(@ps:\000:)$(</proc/${SOURCE_PID}/environ)}")
 	export ${SOURCE_ENV[@]:#}
 }
diff --git a/new-service b/new-service
index 1795fe4..e86ffd3 100755
--- a/new-service
+++ b/new-service
@@ -8,7 +8,7 @@ ln -s ${XDG_RUNTIME_DIR:-/run/user/$UID}/supervise.$1 $1/supervise
 	echo '#!/bin/zsh'
 	if [[ $importenv ]]; then
 		echo 'source ${0:a:h:h}/import-env.zsh'
-		echo "import-env ${importenv[2]}"
+		echo "import-env ${importenv[2]} || exit 1"
 	fi
 	echo "exec $*"
 } > $1/run
diff --git a/pass-secret-service/run b/pass-secret-service/run
index f2b6685..2005bc5 100755
--- a/pass-secret-service/run
+++ b/pass-secret-service/run
@@ -1,8 +1,8 @@
 #!/bin/zsh
 exec 2>&1
 
-source common.zsh
-import-env awesome
+source ${0:a:h:h}/import-env.zsh
+import-env awesome || exit 1
 
 . $HOME/.local/share/pyenv/versions/3.10.0/envs/pass_secret_service/bin/activate
 pass_secret_service
diff --git a/picom/run b/picom/run
index 2eecdb4..6fab42a 100755
--- a/picom/run
+++ b/picom/run
@@ -1,4 +1,4 @@
 #!/bin/zsh
 source ${0:a:h:h}/import-env.zsh
-import-env awesome
+import-env awesome | exit 1
 exec picom
diff --git a/xss-lock/run b/xss-lock/run
index 6db6f71..61701ce 100755
--- a/xss-lock/run
+++ b/xss-lock/run
@@ -1,4 +1,4 @@
 #!/bin/zsh
 source ${0:a:h:h}/import-env.zsh
-import-env awesome
+import-env awesome | exit 1
 exec xss-lock -l -- xsecurelock-wrapper 2>&1