1 files changed, 6 insertions, 1 deletions
diff --git a/bin/bundle b/bin/bundle
index d2c62045bc..fc2aca105a 100755
--- a/bin/bundle
+++ b/bin/bundle
@@ -17,4 +17,9 @@ end
 
 require 'bundler/cli'
 require 'bundler/friendly_errors'
-Bundler.with_friendly_errors { Bundler::CLI.start }
+Bundler.with_friendly_errors {
+    # Set debug flag so we can rescue Thor::error's
+    # and set the correct exit code.
+    ENV["THOR_DEBUG"] = "1"
+    Bundler::CLI.start
+}