Merge "remove some logspam and fix an NPE" into nyc-dev