Aaron Schmischke, thanks for the test and patch! I added more checks to your test and uncovered another bug, and fixed that bug. Here is the pull request: https://github.com/hibernate/hibernate-orm/pull/2249