Merge "Include cause when reporting errors." into nyc-dev