Updated validation handling and exceptions