Remove EventNotFoundException