Merge "Fix data error handling."