Moves body validation into Comment
Merge pull request #898 from iHiD/fix_895

Moves body validation into Comment and fixes #895