Fix NullPointerException at WriterLocal.java:306
Merge pull request #787 from emmanuel-keller/1.6

Fix NullPointerException at WriterLocal.java:306