Updating the place picker to handle the null case.