NPE bugfix for wholesale and tariff