Add some validation to report and commit