Merge "Null check." into nyc-dev