Annotate exceptions with reason where appropriate

Change-Id: I683508361c0da9f7fcad463d69d3f9af06dc9809