diff --git a/bashrc.d/nvm.bash b/bashrc.d/nvm.bash
index acc6ed5..8b85e8a 100644
--- a/bashrc.d/nvm.bash
+++ b/bashrc.d/nvm.bash
@@ -1,3 +1,6 @@
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+if [ -d "$HOME/.nvm" ] ; then
+  export NVM_DIR="$HOME/.nvm"
+  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+fi
+
diff --git a/bashrc.d/pyenv.bash b/bashrc.d/pyenv.bash
index 78848c3..c429a6c 100644
--- a/bashrc.d/pyenv.bash
+++ b/bashrc.d/pyenv.bash
@@ -1,5 +1,5 @@
-export PYENV_ROOT="$HOME/.pyenv"
-if [ -d "$PYENV_ROOT" ] ; then
+if [ -d "$HOME/.pyenv" ] ; then
+  export PYENV_ROOT="$HOME/.pyenv"
   command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
   eval "$(pyenv init -)"
 fi
diff --git a/bashrc.d/rvm.bash b/bashrc.d/rvm.bash
index 0a0a2e7..6d93632 100644
--- a/bashrc.d/rvm.bash
+++ b/bashrc.d/rvm.bash
@@ -1,2 +1,4 @@
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
-addpath "$HOME/.rvm/bin"
+if [ -d "$HOME/.rvm/bin" ] ; then
+  addpath "$HOME/.rvm/bin"
+fi
diff --git a/bashrc.d/yarn.bash b/bashrc.d/yarn.bash
index 860cc60..41c61c6 100644
--- a/bashrc.d/yarn.bash
+++ b/bashrc.d/yarn.bash
@@ -1,2 +1,4 @@
-addpath "$HOME/.yarn/bin"
-addpath "$HOME/.config/yarn/global/node_modules/.bin"
+if [ "$HOME/.yarn/bin" ] ; then
+  addpath "$HOME/.yarn/bin"
+  addpath "$HOME/.config/yarn/global/node_modules/.bin"
+fi