Improve error message and validation