diff --git a/cmd/setup.go b/cmd/setup.go
index 742f6cd27..e7796e07b 100644
--- a/cmd/setup.go
+++ b/cmd/setup.go
@@ -903,7 +903,7 @@ func configureTariffs(conf *globalconfig.Tariffs) (*tariff.Tariffs, error) {
 	}
 
 	if err := eg.Wait(); err != nil {
-		return nil, &ClassError{ClassTariff, err}
+		return &tariffs, &ClassError{ClassTariff, err}
 	}
 
 	return &tariffs, nil