data: improve error tolerance in data