diff --git a/charger/config.go b/charger/config.go
index 60a818047..2b94d2071 100644
--- a/charger/config.go
+++ b/charger/config.go
@@ -33,7 +33,7 @@ func NewFromConfig(typ string, other map[string]interface{}) (v api.Charger, err
 	factory, err := registry.Get(strings.ToLower(typ))
 	if err == nil {
 		if v, err = factory(other); err != nil {
-			err = fmt.Errorf("cannot create %s charger: %w", typ, err)
+			err = fmt.Errorf("cannot create type '%s': %w", typ, err)
 		}
 	} else {
 		err = fmt.Errorf("invalid charger type: %s", typ)
diff --git a/cmd/config.go b/cmd/config.go
index 1d7bd58c7..588bce7b6 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -94,6 +94,7 @@ func (cp *ConfigProvider) configureMeters(conf config) error {
 	for _, cc := range conf.Meters {
 		m, err := meter.NewFromConfig(cc.Type, cc.Other)
 		if err != nil {
+			err = fmt.Errorf("cannot create meter '%s': %w", cc.Name, err)
 			return err
 		}
 
@@ -112,6 +113,7 @@ func (cp *ConfigProvider) configureChargers(conf config) error {
 	for _, cc := range conf.Chargers {
 		c, err := charger.NewFromConfig(cc.Type, cc.Other)
 		if err != nil {
+			err = fmt.Errorf("cannot create charger '%s': %w", cc.Name, err)
 			return err
 		}
 
@@ -130,6 +132,7 @@ func (cp *ConfigProvider) configureVehicles(conf config) error {
 	for _, cc := range conf.Vehicles {
 		v, err := vehicle.NewFromConfig(cc.Type, cc.Other)
 		if err != nil {
+			err = fmt.Errorf("cannot create vehicle '%s': %w", cc.Name, err)
 			return err
 		}
 
diff --git a/meter/config.go b/meter/config.go
index 986378bbb..cb029558c 100644
--- a/meter/config.go
+++ b/meter/config.go
@@ -31,7 +31,7 @@ func NewFromConfig(typ string, other map[string]interface{}) (v api.Meter, err e
 	factory, err := registry.Get(strings.ToLower(typ))
 	if err == nil {
 		if v, err = factory(other); err != nil {
-			err = fmt.Errorf("cannot create %s meter: %w", typ, err)
+			err = fmt.Errorf("cannot create type '%s': %w", typ, err)
 		}
 	} else {
 		err = fmt.Errorf("invalid meter type: %s", typ)
diff --git a/provider/modbus.go b/provider/modbus.go
index 38404dcc0..6d323e1ed 100644
--- a/provider/modbus.go
+++ b/provider/modbus.go
@@ -64,7 +64,7 @@ func NewModbusFromConfig(other map[string]interface{}) (*Modbus, error) {
 	}
 
 	if cc.Model == "" && cc.Value != "" {
-		return nil, errors.New("need modbus model when value configured")
+		return nil, errors.New("need device model when value configured")
 	}
 
 	// no registered configured - need device
diff --git a/vehicle/config.go b/vehicle/config.go
index 3f0d27ad0..a2312340d 100644
--- a/vehicle/config.go
+++ b/vehicle/config.go
@@ -31,7 +31,7 @@ func NewFromConfig(typ string, other map[string]interface{}) (v api.Vehicle, err
 	factory, err := registry.Get(strings.ToLower(typ))
 	if err == nil {
 		if v, err = factory(other); err != nil {
-			err = fmt.Errorf("cannot create %s vehicle: %w", typ, err)
+			err = fmt.Errorf("cannot create type '%s': %w", typ, err)
 		}
 	} else {
 		err = fmt.Errorf("invalid vehicle type: %s", typ)