Fix NullPointerException at WriterLocal.java:306
Fix NullPointerException at FieldValue.java:134
Merge pull request #788 from emmanuel-keller/master

Fix NullPointerException at WriterLocal.java:306