Add additional diags to exceptions