Working on #305 (JPA throws Exceptions)