Add an empty check

Adam G-Hrequested to merge
issue/project_browser-3498564:3498564-do-not-store into 2.0.x

Closes #3498564

Merge request reports