Improve failure log

Change-Id: Icb0f0ec2e4660122d524cf7a7025d1b7f225b4cd