Fix NPE with EntityManager.find() and optional fields
Merge pull request #317 from jlewark/develop

Fix NPE with EntityManager.find() and optional fields