Fix bad handling of no data loaded.
Merge branch 'develop'