0
@@ -485,24 +485,28 @@ module ActiveSupport #:nodoc:
0
       # Build the watch frames. Each frame is a tuple of
0
       #   [module_name_as_string, constants_defined_elsewhere]
0
       watch_frames = descs.collect do |desc|
0
-        if desc.is_a? Module
0
-          mod_name = desc.name
0
-          initial_constants = desc.local_constant_names
0
-        elsif desc.is_a?(String) || desc.is_a?(Symbol)
0
-          mod_name = desc.to_s
0
-
0
-          # Handle the case where the module has yet to be defined.
0
-          initial_constants = if qualified_const_defined?(mod_name)
0
-            mod_name.constantize.local_constant_names
0
+        begin
0
+          if desc.is_a? Module
0
+            mod_name = desc.name
0
+            initial_constants = desc.local_constant_names
0
+          elsif desc.is_a?(String) || desc.is_a?(Symbol)
0
+            mod_name = desc.to_s
0
+
0
+            # Handle the case where the module has yet to be defined.
0
+            initial_constants = if qualified_const_defined?(mod_name)
0
+              mod_name.constantize.local_constant_names
0
+            else
0
+              []
0
+            end
0
           else
0
-           []
0
+            raise Argument, "#{desc.inspect} does not describe a module!"
0
           end
0
-        else
0
-          raise Argument, "#{desc.inspect} does not describe a module!"
0
+          [mod_name, initial_constants]
0
+        rescue NameError
0
+          # mod_name isn't a valid constant name
0
+          nil
0
         end
0
-
0
-        [mod_name, initial_constants]
0
-      end
0
+      end.compact
0
 
0
       constant_watch_stack.concat watch_frames
0
 

0
@@ -901,6 +901,7 @@ Run `rake gems:install` to install the missing gems.
0
           components
0
           config
0
           lib
0
+          vendor
0
         ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
0
 
0
         paths.concat builtin_directories