Use Optional for GeoPoint