No longer crashes on empty folder selection