2 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb
index d5eef2987d..0528a6ad08 100644
--- a/actionpack/lib/action_dispatch/http/headers.rb
+++ b/actionpack/lib/action_dispatch/http/headers.rb
@@ -86,7 +86,7 @@ module ActionDispatch
         @req.fetch_header(env_name(key)) do
           return default unless default == DEFAULT
           return yield if block_given?
-          raise NameError, key
+          raise KeyError, key
         end
       end
 
diff --git a/actionpack/test/dispatch/header_test.rb b/actionpack/test/dispatch/header_test.rb
index 7a155d70cb..374e618b42 100644
--- a/actionpack/test/dispatch/header_test.rb
+++ b/actionpack/test/dispatch/header_test.rb
@@ -158,4 +158,10 @@ class HeaderTest < ActiveSupport::TestCase
     assert_equal({ "HTTP_REFERER"=>"http://example.com/",
                   "CONTENT_TYPE"=>"text/plain" }, env)
   end
+
+  test "fetch exception" do
+    assert_raises KeyError do
+      @headers.fetch(:some_key_that_doesnt_exist)
+    end
+  end
 end