diff --git a/.bash_profile b/.bash_profile
index 6c62d5b..c25e432 100755
--- a/.bash_profile
+++ b/.bash_profile
@@ -21,8 +21,8 @@ shopt -s histreedit          # allows re-edit on C-R
 export EDITOR='vim'          # default editor 
 export FIGNORE=$FIGNORE:.pyc:.o:.class
 
-source ~/.completion/git-completion.bash # git auto complete
-source ~/.bash/bashmarks.bash
+[ -f ~/.completion/git-completion.bash ] &&  source ~/.completion/git-completion.bash 
+[ -f  ~/.bash/bashmarks.bash ]           &&  source ~/.bash/bashmarks.bash
 
 # Path settings(bin before current $PATH to override default version)
 export PATH=$HOME/bin:/usr/local/bin:$PATH
diff --git a/.bashrc b/.bashrc
index bbc7bb2..9521031 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,8 +1,5 @@
 #Adds all files in .bash at lanuch
-for i in ~/.bash/*.sh; do
-	source $i
-done
+[ -d ~/.bash/ ] &&  for i in ~/.bash/*.sh; do source $i; done
+
+[ -d ~/.pbash/ ] &&  for i in ~/.pbash/*.sh; do source $i; done
 
-for i in ~/.pbash/*.sh; do
-	source $i
-done