Revert to hard fail on bad queries.