diff --git a/nvm.sh b/nvm.sh
index 516f9a0..448936b 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -7,7 +7,7 @@
 
 # Auto detect the NVM_DIR
 if [ ! -d "$NVM_DIR" ]; then
-    export NVM_DIR=$(cd $(dirname ${BASH_SOURCE[0]:-$0}); pwd)
+    export NVM_DIR=$(cd $(dirname ${BASH_SOURCE[0]:-$0}) && pwd)
 fi
 
 # Expand a version using the version cache
@@ -21,9 +21,9 @@ nvm_version()
 
     VERSION=`nvm_ls $PATTERN | tail -n1`
     echo "$VERSION"
-    
+
     if [ "$VERSION" = 'N/A' ]; then
-        return 13
+        return
     fi
 }
 
@@ -60,11 +60,11 @@ print_versions()
     for VERSION in $1; do
         PADDED_VERSION=`printf '%10s' $VERSION`
         if [[ -d "$NVM_DIR/$VERSION" ]]; then
-             PADDED_VERSION="\033[0;34m$PADDED_VERSION\033[0m" 
+             PADDED_VERSION="\033[0;34m$PADDED_VERSION\033[0m"
         fi
-        OUTPUT="$OUTPUT\n$PADDED_VERSION" 
+        OUTPUT="$OUTPUT\n$PADDED_VERSION"
     done
-    echo -e "$OUTPUT" | column 
+    echo -e "$OUTPUT" | column
 }
 
 nvm()
@@ -103,7 +103,7 @@ nvm()
       if [ ! `which curl` ]; then
         echo 'NVM Needs curl to proceed.' >&2;
       fi
-      
+
       if [ $# -ne 2 ]; then
         nvm help
         return