Added event input validation