Add basic validation handling.