More general error message; Fix folder path construction.