Same comment here - can you add a code comment and JIRA for this? An example query that would produce this exception would be helpful too.