Fix NPE with EntityManager.find() and optional fields