Added validation for eventData