Fix exception, correct parsing of data