Fix in the token library (not included in this repo) and some code changes to deal with checking for token folder before looking for files to prevent a 500 error