Make the exception string a little more useful

This partial helps bug #1119883

Change-Id: I247ab39406bcc608c0d66a8140dc198b93491ac1
Merge "Make the exception string a little more useful"