Should fix an NPE introduced by save dir cleanup.