Fix error handling for the time func alias

Fixes #8835

53 files changed, 122 insertions, 65 deletions

diff --git a/hugolib/dates_test.go b/hugolib/dates_test.go
index dfcb681a3..4b4dc29d2 100644
--- a/hugolib/dates_test.go
+++ b/hugolib/dates_test.go
@@ -203,3 +203,14 @@ timeZone = "America/LosAngeles"   # Should be America/Los_Angeles
 	b.Assert(err, qt.Not(qt.IsNil))
 	b.Assert(err.Error(), qt.Contains, `failed to load config: invalid timeZone for language "en": unknown time zone America/LosAngeles`)
 }
+
+// Issue 8835
+func TestTimeOnError(t *testing.T) {
+	b := newTestSitesBuilder(t)
+
+	b.WithTemplates("index.html", `time: {{ time "2020-10-20" "invalid-timezone" }}`)
+	b.WithContent("p1.md", "")
+
+	b.Assert(b.BuildE(BuildCfg{}), qt.Not(qt.IsNil))
+
+}
diff --git a/tpl/cast/init.go b/tpl/cast/init.go
index 3f1f3f253..079be4719 100644
--- a/tpl/cast/init.go
+++ b/tpl/cast/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.ToInt,
diff --git a/tpl/cast/init_test.go b/tpl/cast/init_test.go
index dd024b775..5eb4a9086 100644
--- a/tpl/cast/init_test.go
+++ b/tpl/cast/init_test.go
@@ -37,5 +37,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/collections/init.go b/tpl/collections/init.go
index 4126b4410..dc4e1ff31 100644
--- a/tpl/collections/init.go
+++ b/tpl/collections/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.After,
diff --git a/tpl/collections/init_test.go b/tpl/collections/init_test.go
index 3a3b2070f..570e58d93 100644
--- a/tpl/collections/init_test.go
+++ b/tpl/collections/init_test.go
@@ -37,5 +37,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/compare/init.go b/tpl/compare/init.go
index f96e382e5..9aa533f55 100644
--- a/tpl/compare/init.go
+++ b/tpl/compare/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Default,
diff --git a/tpl/compare/init_test.go b/tpl/compare/init_test.go
index 29a525f93..8698cb5e3 100644
--- a/tpl/compare/init_test.go
+++ b/tpl/compare/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/crypto/init.go b/tpl/crypto/init.go
index 2c6e94298..5ce2a4b5e 100644
--- a/tpl/crypto/init.go
+++ b/tpl/crypto/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.MD5,
diff --git a/tpl/crypto/init_test.go b/tpl/crypto/init_test.go
index 120e1e4e7..1c200d777 100644
--- a/tpl/crypto/init_test.go
+++ b/tpl/crypto/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/data/init.go b/tpl/data/init.go
index 3bdc02786..5ac24eaab 100644
--- a/tpl/data/init.go
+++ b/tpl/data/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.GetCSV,
diff --git a/tpl/data/init_test.go b/tpl/data/init_test.go
index 9174d42a6..631a91b39 100644
--- a/tpl/data/init_test.go
+++ b/tpl/data/init_test.go
@@ -41,5 +41,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/debug/init.go b/tpl/debug/init.go
index e478fb46d..1f032ce69 100644
--- a/tpl/debug/init.go
+++ b/tpl/debug/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Dump,
diff --git a/tpl/debug/init_test.go b/tpl/debug/init_test.go
index 35c6a193e..226915b34 100644
--- a/tpl/debug/init_test.go
+++ b/tpl/debug/init_test.go
@@ -38,5 +38,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/encoding/init.go b/tpl/encoding/init.go
index f97b17182..77c9c8c49 100644
--- a/tpl/encoding/init.go
+++ b/tpl/encoding/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Base64Decode,
diff --git a/tpl/encoding/init_test.go b/tpl/encoding/init_test.go
index 5fd71eb32..666a4e549 100644
--- a/tpl/encoding/init_test.go
+++ b/tpl/encoding/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/fmt/init.go b/tpl/fmt/init.go
index f322f5117..c02f985be 100644
--- a/tpl/fmt/init.go
+++ b/tpl/fmt/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Print,
diff --git a/tpl/fmt/init_test.go b/tpl/fmt/init_test.go
index 8fa3945b8..07b740a73 100644
--- a/tpl/fmt/init_test.go
+++ b/tpl/fmt/init_test.go
@@ -38,5 +38,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/hugo/init.go b/tpl/hugo/init.go
index c57d4a27a..f2c43893e 100644
--- a/tpl/hugo/init.go
+++ b/tpl/hugo/init.go
@@ -27,7 +27,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return h },
+			Context: func(args ...interface{}) (interface{}, error) { return h, nil },
 		}
 
 		// We just add the Hugo struct as the namespace here. No method mappings.
diff --git a/tpl/hugo/init_test.go b/tpl/hugo/init_test.go
index 9b1b14be4..bc806448e 100644
--- a/tpl/hugo/init_test.go
+++ b/tpl/hugo/init_test.go
@@ -43,5 +43,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, s.Hugo())
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, s.Hugo())
 }
diff --git a/tpl/images/init.go b/tpl/images/init.go
index e9fd52e73..f3233f6e9 100644
--- a/tpl/images/init.go
+++ b/tpl/images/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Config,
diff --git a/tpl/images/init_test.go b/tpl/images/init_test.go
index d6dc26fe7..d8d8d7839 100644
--- a/tpl/images/init_test.go
+++ b/tpl/images/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/inflect/init.go b/tpl/inflect/init.go
index 52b234df3..548827465 100644
--- a/tpl/inflect/init.go
+++ b/tpl/inflect/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Humanize,
diff --git a/tpl/inflect/init_test.go b/tpl/inflect/init_test.go
index 322813b5f..38499838c 100644
--- a/tpl/inflect/init_test.go
+++ b/tpl/inflect/init_test.go
@@ -37,5 +37,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/internal/templatefuncsRegistry.go b/tpl/internal/templatefuncsRegistry.go
index 6d58d8d2b..df300a5bb 100644
--- a/tpl/internal/templatefuncsRegistry.go
+++ b/tpl/internal/templatefuncsRegistry.go
@@ -49,7 +49,7 @@ type TemplateFuncsNamespace struct {
 	Name string
 
 	// This is the method receiver.
-	Context func(v ...interface{}) interface{}
+	Context func(v ...interface{}) (interface{}, error)
 
 	// Additional info, aliases and examples, per method name.
 	MethodMappings map[string]TemplateFuncMethodMapping
@@ -172,7 +172,10 @@ func (t *TemplateFuncsNamespace) toJSON() ([]byte, error) {
 
 	buf.WriteString(fmt.Sprintf(`%q: {`, t.Name))
 
-	ctx := t.Context()
+	ctx, err := t.Context()
+	if err != nil {
+		return nil, err
+	}
 	ctxType := reflect.TypeOf(ctx)
 	for i := 0; i < ctxType.NumMethod(); i++ {
 		method := ctxType.Method(i)
diff --git a/tpl/js/init.go b/tpl/js/init.go
index 0af10bb10..4ab8671cc 100644
--- a/tpl/js/init.go
+++ b/tpl/js/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		return ns
diff --git a/tpl/lang/init.go b/tpl/lang/init.go
index beb148ff6..f74b6fc35 100644
--- a/tpl/lang/init.go
+++ b/tpl/lang/init.go
@@ -27,7 +27,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Translate,
diff --git a/tpl/lang/init_test.go b/tpl/lang/init_test.go
index 61d7b5047..e62db95b9 100644
--- a/tpl/lang/init_test.go
+++ b/tpl/lang/init_test.go
@@ -42,5 +42,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/math/init.go b/tpl/math/init.go
index 4d8a23fde..32315d362 100644
--- a/tpl/math/init.go
+++ b/tpl/math/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Add,
diff --git a/tpl/math/init_test.go b/tpl/math/init_test.go
index 6c0ce0a93..9998eaf90 100644
--- a/tpl/math/init_test.go
+++ b/tpl/math/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/openapi/openapi3/init.go b/tpl/openapi/openapi3/init.go
index 4b4396ff4..a0084d503 100644
--- a/tpl/openapi/openapi3/init.go
+++ b/tpl/openapi/openapi3/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Unmarshal,
diff --git a/tpl/os/init.go b/tpl/os/init.go
index 9d9b75473..c25d63d56 100644
--- a/tpl/os/init.go
+++ b/tpl/os/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Getenv,
diff --git a/tpl/os/init_test.go b/tpl/os/init_test.go
index 6a91c743a..5d756bab2 100644
--- a/tpl/os/init_test.go
+++ b/tpl/os/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/partials/init.go b/tpl/partials/init.go
index 4666fa336..d6670d99e 100644
--- a/tpl/partials/init.go
+++ b/tpl/partials/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Include,
diff --git a/tpl/partials/init_test.go b/tpl/partials/init_test.go
index 6fd0b3e6d..467e202d4 100644
--- a/tpl/partials/init_test.go
+++ b/tpl/partials/init_test.go
@@ -40,5 +40,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/path/init.go b/tpl/path/init.go
index a7f65073c..07f20d717 100644
--- a/tpl/path/init.go
+++ b/tpl/path/init.go
@@ -29,7 +29,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Split,
diff --git a/tpl/path/init_test.go b/tpl/path/init_test.go
index 20744b239..2282c3305 100644
--- a/tpl/path/init_test.go
+++ b/tpl/path/init_test.go
@@ -37,5 +37,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/reflect/init.go b/tpl/reflect/init.go
index 6ff3f8093..63500a6a4 100644
--- a/tpl/reflect/init.go
+++ b/tpl/reflect/init.go
@@ -27,7 +27,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.IsMap,
diff --git a/tpl/reflect/init_test.go b/tpl/reflect/init_test.go
index c0247b045..2ad33fc25 100644
--- a/tpl/reflect/init_test.go
+++ b/tpl/reflect/init_test.go
@@ -37,5 +37,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/resources/init.go b/tpl/resources/init.go
index d0e20d0ae..8bebec40d 100644
--- a/tpl/resources/init.go
+++ b/tpl/resources/init.go
@@ -30,7 +30,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Get,
diff --git a/tpl/safe/init.go b/tpl/safe/init.go
index becaf38f3..9fbae4044 100644
--- a/tpl/safe/init.go
+++ b/tpl/safe/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.CSS,
diff --git a/tpl/safe/init_test.go b/tpl/safe/init_test.go
index 2ed7b1872..7aa1473d2 100644
--- a/tpl/safe/init_test.go
+++ b/tpl/safe/init_test.go
@@ -37,5 +37,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/site/init.go b/tpl/site/init.go
index 4dc934997..a24d28ad6 100644
--- a/tpl/site/init.go
+++ b/tpl/site/init.go
@@ -27,7 +27,7 @@ func init() {
 		s := d.Site
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return s },
+			Context: func(args ...interface{}) (interface{}, error) { return s, nil },
 		}
 
 		if s == nil {
diff --git a/tpl/site/init_test.go b/tpl/site/init_test.go
index f4c2ecd5c..46af2ef5b 100644
--- a/tpl/site/init_test.go
+++ b/tpl/site/init_test.go
@@ -43,5 +43,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, s)
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, s)
 }
diff --git a/tpl/strings/init.go b/tpl/strings/init.go
index dab4fdbaa..384a5cda7 100644
--- a/tpl/strings/init.go
+++ b/tpl/strings/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Chomp,
diff --git a/tpl/strings/init_test.go b/tpl/strings/init_test.go
index dd15418c8..39d928601 100644
--- a/tpl/strings/init_test.go
+++ b/tpl/strings/init_test.go
@@ -39,5 +39,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/templates/init.go b/tpl/templates/init.go
index 4ae5c12cc..8da8440ae 100644
--- a/tpl/templates/init.go
+++ b/tpl/templates/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Exists,
diff --git a/tpl/templates/init_test.go b/tpl/templates/init_test.go
index cdad188bc..ada53b185 100644
--- a/tpl/templates/init_test.go
+++ b/tpl/templates/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/time/init.go b/tpl/time/init.go
index 6cbdccb8f..0ef4fcdfd 100644
--- a/tpl/time/init.go
+++ b/tpl/time/init.go
@@ -14,6 +14,8 @@
 package time
 
 import (
+	"errors"
+
 	"github.com/gohugoio/hugo/deps"
 	"github.com/gohugoio/hugo/langs"
 	"github.com/gohugoio/hugo/tpl/internal"
@@ -30,7 +32,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name: name,
-			Context: func(args ...interface{}) interface{} {
+			Context: func(args ...interface{}) (interface{}, error) {
 				// Handle overlapping "time" namespace and func.
 				//
 				// If no args are passed to `time`, assume namespace usage and
@@ -40,23 +42,15 @@ func init() {
 
 				switch len(args) {
 				case 0:
-					return ctx
+					return ctx, nil
 				case 1:
-					t, err := ctx.AsTime(args[0])
-					if err != nil {
-						return err
-					}
-					return t
+					return ctx.AsTime(args[0])
 				case 2:
-					t, err := ctx.AsTime(args[0], args[1])
-					if err != nil {
-						return err
-					}
-					return t
+					return ctx.AsTime(args[0], args[1])
 
 				// 3 or more arguments. Currently not supported.
 				default:
-					return "Invalid arguments supplied to `time`. Refer to time documentation: https://gohugo.io/functions/time/"
+					return nil, errors.New("Invalid arguments supplied to `time`. Refer to time documentation: https://gohugo.io/functions/time/")
 				}
 			},
 		}
diff --git a/tpl/time/init_test.go b/tpl/time/init_test.go
index 8c00ec51f..d7efabfa7 100644
--- a/tpl/time/init_test.go
+++ b/tpl/time/init_test.go
@@ -42,5 +42,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/transform/init.go b/tpl/transform/init.go
index 9e57c07f6..aa7297bc4 100644
--- a/tpl/transform/init.go
+++ b/tpl/transform/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.Emojify,
diff --git a/tpl/transform/init_test.go b/tpl/transform/init_test.go
index 47bd8a391..ec3c35897 100644
--- a/tpl/transform/init_test.go
+++ b/tpl/transform/init_test.go
@@ -36,5 +36,7 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
 }
diff --git a/tpl/urls/init.go b/tpl/urls/init.go
index 0abe0d125..0a97045e2 100644
--- a/tpl/urls/init.go
+++ b/tpl/urls/init.go
@@ -26,7 +26,7 @@ func init() {
 
 		ns := &internal.TemplateFuncsNamespace{
 			Name:    name,
-			Context: func(args ...interface{}) interface{} { return ctx },
+			Context: func(args ...interface{}) (interface{}, error) { return ctx, nil },
 		}
 
 		ns.AddMethodMapping(ctx.AbsURL,
diff --git a/tpl/urls/init_test.go b/tpl/urls/init_test.go
index 27b21144a..7e53c247a 100644
--- a/tpl/urls/init_test.go
+++ b/tpl/urls/init_test.go
@@ -38,5 +38,8 @@ func TestInit(t *testing.T) {
 	}
 
 	c.Assert(found, qt.Equals, true)
-	c.Assert(ns.Context(), hqt.IsSameType, &Namespace{})
+	ctx, err := ns.Context()
+	c.Assert(err, qt.IsNil)
+	c.Assert(ctx, hqt.IsSameType, &Namespace{})
+
 }