make sure timeouts and errors come through, probably should be done a different way
Merge branch 'bad-getdata-return'