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

Fix NullPointerException at WriterLocal.java:306