Dump diags when save failes.

DO NOT MERGE INTO MASTER!