Unfortunately, I had to revert the second fix for this one as we had some tests failing with PostgreSQL and other databases:

Test Result (2 failures / +2)
org.hibernate.jpa.test.criteria.selectcase.SelectCaseTest.selectCaseWithValuesShouldWork
org.hibernate.jpa.test.criteria.selectcase.SelectCaseTest.simpleSelectCaseWithValuesShouldWork

The NPE is gone but you unfortunately will hit another exception right after it.