[events] Quick fixes for error handling.