Fixed issue with events without data.