Fixed NPE reported in market.