Respect assert.doesNotThrow message.

Addresses #6400.
Special handling to detect when user has supplied
a custom message.