1 files changed, 6 insertions, 19 deletions

diff --git a/echo/echo_default.go b/echo/echo_default.go
index 76f543d..ff3c754 100644
--- a/echo/echo_default.go
+++ b/echo/echo_default.go
@@ -22,17 +22,8 @@ import (
 
 // Docs: https://echo.labstack.com/guide/
 
-// TODO:
-// - Integrate CSRF
-// - Integrate session
-
 const defaultBodySizeLimit = "10M"
 
-var mandatoryTemplates = []string{
-        "404.tpl", "40x.tpl", "50x.tpl",
-        "header.tpl", "footer.tpl",
-}
-
 func makeMiddlewareSkipper(c *prometheus.PrometheusConfig) middleware.Skipper {
         var path string
 
@@ -209,21 +200,17 @@ func (w *EchoWrapper) configureTemplates(c *EchoConfig) error {
                 templates = c.EmbeddedTemplates
         }
 
-        // Only install template handlers if the path and glob are set
+        // Only install template handlers if the path is set
         if templates != nil {
-                w.HTTPErrorHandler = ErrorHandler(templates, c.TemplateFunctions)
-
-                tr, err := NewTemplateRenderer(templates, "*.tpl", c.TemplateFunctions)
+                tr, err := NewTemplateRenderer(templates, "*.tpl", c.TemplateFunctions, w.Debug)
                 if err != nil {
                         return fmt.Errorf("Error loading template renderer: %w", err)
                 }
-                w.Renderer = tr
 
-                for _, t := range mandatoryTemplates {
-                        if !tr.HaveTemplate(w.NewContext(nil, nil), t) {
-                                return fmt.Errorf("Template renderer is missing required template %s", t)
-                        }
-                }
+                w.HTTPErrorHandler = NewDefaultErrorHandler(tr).HandleError
+                w.Renderer = tr
+        } else {
+                w.HTTPErrorHandler = NewNoHTMLErrorHandler().HandleError
         }
 
         w.templateFS = templates