No data response is no longer error.
Merge branch 'bugfixes'