Better handling unexpected data