Add error messages; Add validates to stop