Fix NPE on recent machines page