removed invalid check for e before calling method or setting property on event