Fixed NPE in zones and lots