Merge "Fix null pointer dereference." into nyc-dev