b61a61e
resolve: do not trigger assertions on invalid query (cherry picked from commit 055acd4d8b385fd9ff29e49e0c46856a9e705433)