[Fixes #66065722] changed error message when no data
Merge branch 'no_data_message' into develop