added exception message assertion #6

please, merge 1.0.x
using cherry-pick 7ebcad812f2fea88f8b70b31bec88d6669af6f6b from master