am d51bfc9b: Merge "Fix the potential segmentation fault"

* commit 'd51bfc9b1fe89321af3c629e7b23a747050332e1':
  Fix the potential segmentation fault