Improved message parsing (1 error on 850 messages)