Extend exception messages.

Closes-bug: #1264980
Change-Id: Ia57821cd906a203b18546b9e93e38f3e1bc71025