More error report content

Change-Id: I52a3572f8cb4605797115473325b5e529577c9c9