Clean-up exception messages; use more concise idioms

Change-Id: I3acc97057cae9d06d374615a7551ce08123626d5