added eve error handling