Improve exception messages

Change-Id: I95b8d1bfcba66ba5670345e9159f0dca11e6d967