Avoid doing a 500 if query can't be converted to a CONSTRUCT (for exampe, when...

Avoid doing a 500 if query can't be converted to a CONSTRUCT (for exampe, when using aggregation functions)