Fix null pointer refrence in event context in backport from v3-3-test