I am using version 5.0.12.Final and have also run into the same issue. I still see the need of solving this issue. Correct me if I am wrong but the @NotFound handling should prevent throwing an exception instead of changing the fetch type? I understand that you have to look to the other side to verify whether data exists or not but this should only be performed in case data are fetched. In this specail case this should be done lazy.