Merge "Add missing null checks" into nyc-dev