Better comment error detection

Now it uses validation instead of custom error stuff.
Make method for joining errors

Woo, DRY
Merge branch 'master' into clean-up