Merge "Guard against monkey crash." into nyc-dev