diff --git a/charger/template.go b/charger/template.go
index 5f5a69558..ddbfca36b 100644
--- a/charger/template.go
+++ b/charger/template.go
@@ -11,11 +11,9 @@ func init() {
 
 func NewChargerFromTemplateConfig(other map[string]interface{}) (api.Charger, error) {
 	instance, err := templates.RenderInstance(templates.Charger, other)
-
-	var res api.Charger
-	if err == nil {
-		res, err = NewFromConfig(instance.Type, instance.Other)
+	if err != nil {
+		return nil, err
 	}
 
-	return res, err
+	return NewFromConfig(instance.Type, instance.Other)
 }
diff --git a/meter/template.go b/meter/template.go
index 228447f05..2de6e570d 100644
--- a/meter/template.go
+++ b/meter/template.go
@@ -11,11 +11,9 @@ func init() {
 
 func NewMeterFromTemplateConfig(other map[string]interface{}) (api.Meter, error) {
 	instance, err := templates.RenderInstance(templates.Meter, other)
-
-	var res api.Meter
-	if err == nil {
-		res, err = NewFromConfig(instance.Type, instance.Other)
+	if err != nil {
+		return nil, err
 	}
 
-	return res, err
+	return NewFromConfig(instance.Type, instance.Other)
 }
diff --git a/vehicle/template.go b/vehicle/template.go
index f22bb13a0..e6399af0a 100644
--- a/vehicle/template.go
+++ b/vehicle/template.go
@@ -11,11 +11,9 @@ func init() {
 
 func NewVehicleFromTemplateConfig(other map[string]interface{}) (api.Vehicle, error) {
 	instance, err := templates.RenderInstance(templates.Vehicle, other)
-
-	var res api.Vehicle
-	if err == nil {
-		res, err = NewFromConfig(instance.Type, instance.Other)
+	if err != nil {
+		return nil, err
 	}
 
-	return res, err
+	return NewFromConfig(instance.Type, instance.Other)
 }