added some checks to zone loading