Add error messages and validation