2 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb
index 81ee19d996..06238ca747 100644
--- a/actionpack/lib/action_view.rb
+++ b/actionpack/lib/action_view.rb
@@ -43,6 +43,10 @@ module ActionView
   autoload :PathResolver,      'action_view/template/resolver'
   autoload :PathSet,           'action_view/paths'
   autoload :FileSystemResolverWithFallback, 'action_view/template/resolver'
+
+  autoload :TemplateError,     'action_view/template/error'
+  autoload :TemplateHandler,   'action_view/template'
+  autoload :TemplateHandlers,  'action_view/template'
 end
 
 require 'action_view/erb/util'
diff --git a/actionpack/lib/action_view/template/error.rb b/actionpack/lib/action_view/template/error.rb
index a136d4333b..648f708d3d 100644
--- a/actionpack/lib/action_view/template/error.rb
+++ b/actionpack/lib/action_view/template/error.rb
@@ -100,4 +100,6 @@ module ActionView
         end
     end
   end
-end
-\ No newline at end of file
+
+  TemplateError = Template::Error
+end