Made parsing more fault-tolerant.