Pretty print the offending query too
Include only offending clause in error message