Remove RequestFinishedEvent
Error handling