Max Rydahl Andersen, I'm going to move the fix for catching antlr exceptions and bubbling them up as {{QueryException}}s instead in HHH-11568 Open . Throwing IllegalArgumentException here is still a problem but remains consistent with the 5.2 behavior. At least the root-cause for the IllegalArgumentException will be a QueryException rather than the antlr one.