Make EventInfo more robust