Improve message displayed in diffs, etc. for bad values

Change-Id: I2ee9a3b488501ecc9248dfeae408e787d8f61c8d