Improve handling of data errors