Fix for null zip code