lib/bundler.rb in bundler-1.0.20.rc vs lib/bundler.rb in bundler-1.0.20

@@ -2,11 +2,12 @@
 require 'fileutils'
 require 'pathname'
 
 begin
   # Pull in Psych if we can, but not if Syck is already loaded
-  require 'psych' unless defined?(YAML)
+  require 'psych' unless defined?(::YAML)
 rescue LoadError
+ensure
   require 'yaml'
 end
 
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'