Add more detail to the error reporting.

Change-Id: Ia7ecf6648236eecfd9af5e98e641529324919dc5
2 files changed