Fix NPE at FieldValue.java:164
Merge pull request #797 from emmanuel-keller/1.5

Fix NPE at FieldValue.java:164