diff --git a/bin/updater b/bin/updater
index 07a1539f..a838d93f 100755
--- a/bin/updater
+++ b/bin/updater
@@ -13,18 +13,18 @@ case "${STAGE}" in
 			echo ":: S1 | Unlinking legacy file paths"
 			./uninstall.sh --remove-legacy-paths
 			
-			echo ":: S1 | Unlinking files (safety measure)"
+			echo ":: S1 | Uninstalling & unlinking (safety measure)"
 			./uninstall.sh
 		else
-			echo ":: S1 | Unlinking files"
+			echo ":: S1 | Uninstalling"
 			./uninstall.sh
 		fi
 		
-		echo ":: S1 | Linking files"
+		echo ":: S1 | Installing"
 		./install.sh
 		
 		# Remove legacy updater version file
-		rm -rf "$HOME/.config/.jstm_dotfiles_updater"
+		[[ -f "${HOME}/.config/.jstm_dotfiles_updater" ]] && rm -rf "${HOME}/.config/.jstm_dotfiles_updater"
 		
 		echo ":: S1 | Update complete."
 		echo "       Make sure to execute \"dotfiles-install-software\""
@@ -46,7 +46,7 @@ case "${STAGE}" in
 		echo ":: S0 | Pulling updates"
 		git pull
 		
-		exec env STAGE=1 UPDATER_VERSION=${LOCAL_UPDATER_VERSION} "$HOME/.dotfiles/bin/updater"
+		exec env STAGE=1 UPDATER_VERSION=${LOCAL_UPDATER_VERSION} "${HOME}/.dotfiles/bin/updater"
 		
 		;;
 esac