diff --git a/restapi/handlers/template-varlist.go b/restapi/handlers/template-varlist.go
index 2f2261ad2e7bc910b49e03ab5713de767ea27818_cmVzdGFwaS9oYW5kbGVycy90ZW1wbGF0ZS12YXJsaXN0Lmdv..c7bf1f08085e4766f37236db8c879700eb2a319d_cmVzdGFwaS9oYW5kbGVycy90ZW1wbGF0ZS12YXJsaXN0Lmdv 100644
--- a/restapi/handlers/template-varlist.go
+++ b/restapi/handlers/template-varlist.go
@@ -4,7 +4,6 @@
 	"context"
 	"errors"
 	"fmt"
-	"net/http"
 
 	"github.com/Masterminds/squirrel"
 	"github.com/go-openapi/runtime/middleware"
@@ -85,6 +84,8 @@
 
 // Handle the incoming request.
 func (h *TemplateVarlistHandler) Handle(params op.TemplateVarlistParams, principals *models.Principal) middleware.Responder {
+	log := zerolog.Ctx(params.HTTPRequest.Context())
+
 	varlist, err := h.handle(
 		params.HTTPRequest.Context(),
 		params.Request,
@@ -100,9 +101,7 @@
 			return r
 		}
 
-		return op.
-			NewTemplateVarlistDefault(http.StatusInternalServerError).
-			WithPayload(models.FromError(err))
+		return InternalError(err, log, false)
 	}
 
 	return op.NewTemplateVarlistOK().WithPayload(varlist)