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

Fix NullPointerException at StringUtils.java:105