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

Fix NullPointerException at FieldValue.java:134