diff --git a/xaal.go b/xaal.go
index b209ef7d48e13f4a65e6f2c9a774684a679d8121..9f3ade606f0889707ba623fd9653d89a2ba84833 100644
--- a/xaal.go
+++ b/xaal.go
@@ -369,20 +369,17 @@ func (dev *Lamp) toggle(xaal.MessageBody) *xaal.MessageBody {
 }
 
 func (dev *Lamp) setBrightness(body xaal.MessageBody) *xaal.MessageBody {
-	value, exists := body["brightness"]
-	if exists {
-		target, _ := convertToInt(value)
-		dev.Z2MDevice.Set(fmt.Sprintf(`{"brightness": %d}`, target*255/100))
+	value, err := convertToInt(body["brightness"])
+	if err == nil {
+		dev.Z2MDevice.Set(fmt.Sprintf(`{"brightness": %d}`, value*255/100))
 	}
 	return nil
 }
 
 func (dev *Lamp) setWhiteTemperature(body xaal.MessageBody) *xaal.MessageBody {
-	value, exists := body["white_temperature"]
-	if exists {
-		target, _ := convertToInt(value)
-		target = convertMired(target)
-		dev.Z2MDevice.Set(fmt.Sprintf(`{"color_temp": %d}`, target))
+	value, err := convertToInt(body["white_temperature"])
+	if err == nil {
+		dev.Z2MDevice.Set(fmt.Sprintf(`{"color_temp": %d}`, convertMired(value)))
 	}
 	return nil
 }