Merge pull request #107 from ariard/event_handle_error