Merge "Dumping a trace isn't an error" into nyc-dev