change error vars
Merge branch 'getdata-work'