diff --git a/tariff/tibber.go b/tariff/tibber.go
index 898f08045..670d674de 100644
--- a/tariff/tibber.go
+++ b/tariff/tibber.go
@@ -31,14 +31,14 @@ func NewTibber(other map[string]interface{}) (*Tibber, error) {
 		Cheap  float64
 	}
 
-	if cc.Token == "" {
-		return nil, errors.New("missing token")
-	}
-
 	if err := util.DecodeOther(other, &cc); err != nil {
 		return nil, err
 	}
 
+	if cc.Token == "" {
+		return nil, errors.New("missing token")
+	}
+
 	log := util.NewLogger("tibber").Redact(cc.Token, cc.HomeID)
 
 	t := &Tibber{