lib/active_support/dependencies.rb in activesupport-3.1.0.rc1 vs lib/active_support/dependencies.rb in activesupport-3.1.0.rc2

@@ -472,10 +472,10 @@
 
       unless qualified_const_defined?(from_mod.name) && Inflector.constantize(from_mod.name).equal?(from_mod)
         raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
       end
 
-      raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name)
+      raise NameError, "#{from_mod} is not missing constant #{const_name}!" if local_const_defined?(from_mod, const_name)
 
       qualified_name = qualified_name_for from_mod, const_name
       path_suffix = qualified_name.underscore
 
       trace = caller.reject {|l| l =~ %r{#{Regexp.escape(__FILE__)}}}