am 9f6e6c0d: Fix NPE when calling unicodeWrap DO NOT MERGE

* commit '9f6e6c0d57cfd18a67327276c8ee705bf29ab697':
  Fix NPE when calling unicodeWrap DO NOT MERGE