Merge "Fix a NPE" into nyc-dev