Added null check for the Event that is thrown when the path is changed