Fix NPE on track cut