Improve  error handling on event process