Fixed null pointer in event graph