Tree Grid View References to Items that are not available

We've successfully created multiple Tree Grid Views following the documentation and various blog posts.

However we're run into an issue when a query is updated (say removing elements) before those elements are removed or unmapped from the Tree Grid View.

We get this sort of error:

Has anyone else encountered this and is there anyway to clean up broken links other than rebuilding the whole TGV?

Thanks in advance!