Fixed NPE in VillageWatcher