Fix document construction - GeoFields cannot be None so stop instantiating the document too early