diff --git a/actionpack/lib/action_controller/base/http.rb b/actionpack/lib/action_controller/base/http.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_controller/base/http.rb
+++ b/actionpack/lib/action_controller/base/http.rb
@@ -36,7 +36,7 @@ module ActionController
     # ==== Returns
     # String
     def self.controller_path
-      @controller_path ||= self.name.sub(/Controller$/, '').underscore
+      @controller_path ||= name && name.sub(/Controller$/, '').underscore
     end
 
     # Delegates to the class' #controller_path
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -10,7 +10,7 @@ module Mime
     %w(<< concat shift unshift push pop []= clear compact! collect!
     delete delete_at delete_if flatten! map! insert reject! reverse!
     replace slice! sort! uniq!).each do |method|
-      define_method(method) { @symbols = nil; super }
+      define_method(method) {|*args| @symbols = nil; super(*args) }
     end
   end
Small changes to get <I> passing (for the most part)