Greatly improved how errorneous messages are handled