Handle error, fix parser