Polished exception message
(cherry picked from commit 6110919)