am 7a082985: Merge "Fixes an issue that occured unexpected exception "pointerIndex out of range"."

* commit '7a0829850ee8d1ee2f436c40c8a5af2ff7d96533':
  Fixes an issue that occured unexpected exception "pointerIndex out of range".