diff --git a/binscripts/rvm-update-latest b/binscripts/rvm-update-latest
index e0119ae8d0..0df502ad0b 100755
--- a/binscripts/rvm-update-latest
+++ b/binscripts/rvm-update-latest
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+set -o errtrace
+set -o errexit
+
+export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
+
 rvm_ignore_rvmrc=${rvm_ignore_rvmrc:-0}
 if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
   [[ -s /etc/rvmrc ]] && source /etc/rvmrc
@@ -7,8 +12,8 @@ if [[ $rvm_ignore_rvmrc -eq 0 ]]; then
 fi
 
 rvm_path="${rvm_path:-$HOME/.rvm}"
-mkdir -p $rvm_path/src/
-cd $rvm_path/src
+mkdir -p "$rvm_path/src/" "$rvm_path/src/archives"
+cd "$rvm_path/src"
 
 stable_version=$(curl -B http://rvm.beginrescueend.com/releases/stable-version.txt 2>/dev/null)
 stable_md5=$(curl -B http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz.md5 2>/dev/null)
diff --git a/scripts/get b/scripts/get
index ceab06c77a..d0159786af 100755
--- a/scripts/get
+++ b/scripts/get
@@ -111,7 +111,7 @@ get_head()
 
       builtin cd "${rvm_src_path:-"$rvm_path/src"}" && \
         ( git clone --depth 1 git://github.com/wayneeseguin/rvm.git || \
-          git clone https://github.com/wayneeseguin/rvm.git )&& \
+          git clone https://github.com/wayneeseguin/rvm.git ) && \
         builtin cd rvm/ && ./scripts/install
     fi
   )