This provides saner error messages for malformed
or invalid sql.

Change-Id: I86664db1f1446128bb73e6749f8c00f8313dd414