0
@@ -96,7 +96,7 @@ module ActionController #:nodoc:
0
           inherited_without_helper(child)
0
           begin
0
             child.helper(child.controller_name)
0
-          rescue Object
0
+          rescue NameError, LoadError
0
             # No default helper available for this controller
0
           end
0
         end        

0
@@ -18,8 +18,10 @@ module Dependencies
0
       loaded << file_name
0
       begin
0
         require_or_load(file_name)
0
+      rescue LoadError
0
+        raise unless swallow_load_errors
0
       rescue Object => e
0
-        raise ScriptError, "#{e.message}" unless e.is_a?(LoadError) && swallow_load_errors
0
+        raise ScriptError, "#{e.message}"
0
       end
0
     end
0
   end