diff --git a/web/handler.go b/web/handler.go
index f4eb4bf..ff24ceb 100644
--- a/web/handler.go
+++ b/web/handler.go
@@ -15,6 +15,11 @@ import (
 
 // NewHandler creates a new Handler object.
 func NewHandler(s shortener.Shortener) *Handler {
+	t := newHandlerTemplate()
+	return &Handler{s, t}
+}
+
+func newHandlerTemplate() *template.Template {
 	t := template.New("base")
 
 	files, err := AssetDir("templates")
@@ -31,7 +36,7 @@ func NewHandler(s shortener.Shortener) *Handler {
 		t.New(f).Parse(string(content))
 	}
 
-	return &Handler{s, t}
+	return t
 }
 
 // Handler handle HTTP requests.