Fixed the parsing on the CSV files and throw errors when needed