Hi Gábor Varga,

First, thanks for the detailed description of the issue. Very helpful!

In fact, following your description of the generated bytecode, #7 should have a null check pretty much like #1

I opened a pull request with a fix and test case: https://github.com/hibernate/hibernate-orm/pull/1273