Unify comments with commit
Continue instead of break on error. Unify error messages.