diff --git a/hems/semp/semp.go b/hems/semp/semp.go
index 3a091d890..ea4e73fe5 100644
--- a/hems/semp/semp.go
+++ b/hems/semp/semp.go
@@ -77,13 +77,16 @@ func New(conf map[string]interface{}, site site.API, httpd *server.HTTPd) (*SEMP
 
 	var did []byte
 	if cc.DeviceID == "" {
-		did, err = uniqueDeviceID()
+		if did, err = uniqueDeviceID(); err != nil {
+			return nil, fmt.Errorf("creating device id: %w", err)
+		}
 	} else {
-		did, err = hex.DecodeString(cc.DeviceID)
-
+		if did, err = hex.DecodeString(cc.DeviceID); err != nil {
+			return nil, fmt.Errorf("device id: %w", err)
+		}
 	}
 
-	if err != nil || len(did) != 6 {
+	if len(did) != 6 {
 		return nil, fmt.Errorf("invalid device id: %v", cc.DeviceID)
 	}