Committing fix for the NPE in event simulator core