diff --git a/lib/rvm.zsh b/lib/rvm.zsh
index 597be1b33..dbfaf8796 100644
--- a/lib/rvm.zsh
+++ b/lib/rvm.zsh
@@ -1,6 +1,10 @@
 # get the name of the branch we are on
 function rvm_prompt_info() {
   ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
+  if [ -z $ruby_version ]
+  then
+    return
+  fi
   echo "($ruby_version)"
 }
 
diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh
index 3c96b8da9..a3c3cc33c 100644
--- a/plugins/bundler/bundler.plugin.zsh
+++ b/plugins/bundler/bundler.plugin.zsh
@@ -37,10 +37,5 @@ _run-with-bundler() {
 
 ## Main program
 for cmd in $bundled_commands; do
-  eval "function bundled_$cmd () { _run-with-bundler $cmd \$@}"
-  alias $cmd=bundled_$cmd
-
-  if which _$cmd > /dev/null 2>&1; then
-        compdef _$cmd bundled_$cmd
-  fi
+  alias $cmd="_run-with-bundler $cmd"
 done