Improve data error cases