Refactored ErrorEvent