diff --git a/nvm.sh b/nvm.sh
index e4ce9f8..70f90da 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -262,8 +262,8 @@
               curl -L -C - --progress-bar $url -o "$tmptarball" && \
               nvm_checksum `${shasum} "$tmptarball" | awk '{print $1}'` $sum && \
               tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
-              mv "$tmpdir" "$NVM_DIR/$VERSION" && \
-              rm -f "$tmptarball"
+              rm -f "$tmptarball" && \
+              mv "$tmpdir" "$NVM_DIR/$VERSION"
               )
             then
               nvm use $VERSION
@@ -389,7 +389,7 @@
       if [ -z $VERSION ]; then
         VERSION=`nvm_version $2`
       fi
-      if [ ! -d $NVM_DIR/$VERSION ]; then
+      if [ ! -d "$NVM_DIR/$VERSION" ]; then
         echo "$VERSION version is not installed yet"
         return 1
       fi