Improve exception messages (for debugging)

Change-Id: Id2e00e0b0363c58c88585dd15f34156e57a7aaac