Merge "Add a missing null object check" into nyc-dev