diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
old mode 100644
new mode 100755
diff --git a/tools/install.sh b/tools/install.sh
index aedb706da..761c91fcd 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -1,36 +1,36 @@
 if [ -d ~/.oh-my-zsh ]
 then
-  echo "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove ~/.oh-my-zsh if you want to install"
-  exit
+  echo -e "\033[0;33mYou already have Oh My Zsh installed.\033[0m You'll need to remove ~/.oh-my-zsh if you want to install";
+  exit 1
 fi
 
-echo "\033[0;34mCloning Oh My Zsh...\033[0m"
-/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
+echo -e "\033[0;34mCloning Oh My Zsh...\033[0m"
+/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \
+ || ( echo "Couldn't clone repository."; exit 2)
 
-echo "\033[0;34mLooking for an existing zsh config...\033[0m"
+echo -e "\033[0;34mLooking for an existing zsh config...\033[0m"
 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
 then
-  echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m";
-  cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
-  rm ~/.zshrc;
+  echo -e "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m";
+  cp -n ~/.zshrc ~/.zshrc.pre-oh-my-zsh && rm ~/.zshrc \
+   || ( echo "Couldn't backup .zshrc!"; exit 3)
 fi
 
-echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
-cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
+echo -e "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
+cp -n ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc || exit 4
 
-echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
-echo "export PATH=$PATH" >> ~/.zshrc
+echo -e "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
+echo "export PATH=$PATH" >> ~/.zshrc;
 
-echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
-chsh -s `which zsh`
+echo -e "\033[0;34mYou might need to change your default shell to zsh:\033[0m"
+echo "chsh -s $(which zsh)"
 
-echo "\033[0;32m"'         __                                     __   '"\033[0m"
-echo "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
-echo "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
-echo "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
-echo "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
-echo "\033[0;32m"'                        /____/                       '"\033[0m"
+echo -e "\033[0;32m"'         __                                     __   '"\033[0m"
+echo -e "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
+echo -e "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"
+echo -e "\033[0;32m"'/ /_/ / / / /  / / / / / / /_/ /    / /_(__  ) / / / '"\033[0m"
+echo -e "\033[0;32m"'\____/_/ /_/  /_/ /_/ /_/\__, /    /___/____/_/ /_/  '"\033[0m"
+echo -e "\033[0;32m"'                        /____/                       '"\033[0m"
 
-echo "\n\n \033[0;32m....is now installed.\033[0m"
-/usr/bin/env zsh
-source ~/.zshrc
+echo -e "\n\n \033[0;32m....is now installed.\033[0m"
+/usr/bin/env zsh && source ~/.zshrc;
diff --git a/tools/uninstall.sh b/tools/uninstall.sh
old mode 100644
new mode 100755
index 8ff583322..9f66f6242
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,20 +1,22 @@
-echo "Removing ~/.oh-my-zsh"
-if [[ -d ~/.oh-my-zsh ]]
-then
-  rm -rf ~/.oh-my-zsh
+if [[ -d ~/.oh-my-zsh ]]; then
+  echo "Removing '~/.oh-my-zsh'";
+  rm -rf ~/.oh-my-zsh;
+else
+  echo "Cannot find '~/.oh-my-zsh'";
+  exit 1
 fi
 
-echo "Looking for an existing zsh config..."
 if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]
 then
-  echo "Found ~/.zshrc. Backing up to ~/.zshrc.pre-oh-my-zsh";
-  rm ~/.zshrc;
-  cp ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
+  echo "Found '~/.zshrc.pre-oh-my-zsh', Restoring to ~/.zshrc";
+  mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc \
+   || ( echo "cannot restore '~/.zshrc'!"; exit 2)
   source ~/.zshrc;
 else
-  echo "Switching back to bash"
-  chsh -s /bin/bash
-  source /etc/profile
+  echo "You might want to switch back to bash:";
+  echo "chsh -s /bin/bash";
+  echo "source /etc/profile";
 fi
 
-echo "Thanks for trying out Oh My Zsh. It's been uninstalled."
\ No newline at end of file
+echo "Thanks for trying out 'Oh My Zsh', It is no longer installed.";
+
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
old mode 100644
new mode 100755
index 52a8cc4da..395a21d9e
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,6 +1,6 @@
 current_path=`pwd`
 echo -e "\033[0;34mUpgrading Oh My Zsh\033[0m"
-( cd $ZSH && git pull origin master )
+cd "${ZSH:-$HOME/.oh-my-zsh}" && git pull origin master || (echo "Cannot upgrade ZSH!"; exit 1)
 echo -e "\033[0;32m"'         __                                     __   '"\033[0m"
 echo -e "\033[0;32m"'  ____  / /_     ____ ___  __  __   ____  _____/ /_  '"\033[0m"
 echo -e "\033[0;32m"' / __ \/ __ \   / __ `__ \/ / / /  /_  / / ___/ __ \ '"\033[0m"