Merge "Add missing null checks on Conference and Connection." into nyc-dev