clean up some more and do a proper ugc_zone null check