Fix NullPointerException at StringUtils.java:105
Merge pull request #792 from emmanuel-keller/1.6

Fix NullPointerException at StringUtils.java:105