Enhance the exception messages consistency.

(thanks Barzogh for the notice)