Merge "Fixes NPE in dump of queries"