Fix for #1804: anticipate zone as None.