Don't call exit! if Bundler.setup has an exception

1 files changed, 10 insertions, 16 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 40226f7cb7..eca6c6d483 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -70,22 +70,16 @@ module Bundler
     def gem_setup(*groups)
       return @setup if @setup
 
-      begin
-        if groups.empty?
-          # Load all groups, but only once
-          @setup = load.setup
-        else
-          # Figure out which groups haven't been loaded yet
-          unloaded = groups - (@completed_groups || [])
-          # Record groups that are now loaded
-          @completed_groups = groups | (@completed_groups || [])
-          # Load any groups that are not yet loaded
-          unloaded.any? ? load.setup(*unloaded) : load
-        end
-      rescue Bundler::GemNotFound => e
-        STDERR.puts e.message
-        STDERR.puts "Try running `bundle install`."
-        exit!
+      if groups.empty?
+        # Load all groups, but only once
+        @setup = load.setup
+      else
+        # Figure out which groups haven't been loaded yet
+        unloaded = groups - (@completed_groups || [])
+        # Record groups that are now loaded
+        @completed_groups = groups | (@completed_groups || [])
+        # Load any groups that are not yet loaded
+        unloaded.any? ? load.setup(*unloaded) : load
       end
     end
     alias setup gem_setup unless defined?(Bundler::ENV_LOADED)