Complete query walk on error

cbugg: close bug-938