Improve wrong exception error message.
Improve wrong exception error message.

If you get a different exception than what you were expecting
then it's useful to have as much information as possible. To that
end, now also include the message from the actual exception.

Change-Id: I1323fcdf051fd26e162ef6cf850bc28d098cf6e8

jmorse/cyanide,jmorse/cyanide,jmorse/cyanide,jmorse/cyanide