Fix NullPointerException at FieldValue.java:134
Merge pull request #790 from emmanuel-keller/1.6

Fix NullPointerException at FieldValue.java:134