More tweaks for better error messages when query translation fails on
purpose.