Tweaked Message validation.
Tweaked Message validation again.