Corrected some fail logic regarding events.