Fix for handling failed events