diff --git a/bin/rbenv-path b/bin/rbenv-path
new file mode 100755
index 00000000..aefb3eba
--- /dev/null
+++ b/bin/rbenv-path
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ -n "$1" ]; then
+  RBENV_VERSION="$1"
+elif [ -z "$RBENV_VERSION" ]; then
+  RBENV_VERSION="$(rbenv-version)"
+fi
+
+RBENV_VERSION_PATH="${HOME}/.rbenv/versions/${RBENV_VERSION}"
+if [ ! -d "$RBENV_VERSION_PATH" ]; then
+  echo "rbenv: version \`${RBENV_VERSION}' not installed" >&2
+  exit 1
+fi
+
+echo "$RBENV_VERSION_PATH"
diff --git a/bin/rbenv-set-default b/bin/rbenv-set-default
index 6c0b7298..0632747a 100755
--- a/bin/rbenv-set-default
+++ b/bin/rbenv-set-default
@@ -8,10 +8,7 @@ if [ -z "$RBENV_VERSION" ]; then
   exit 1
 fi
 
-RBENV_VERSION_PATH="${HOME}/.rbenv/versions/${RBENV_VERSION}"
-if [ ! -d "$RBENV_VERSION_PATH" ]; then
-  echo "rbenv: version \`${RBENV_VERSION}' not installed" >&2
-  exit 1
-fi
+# Make sure the specified version is installed
+rbenv-path "$RBENV_VERSION" >/dev/null
 
 echo "$RBENV_VERSION" > "${HOME}/.rbenv/default"