Merge "Optimizing: Prevent potential valgrind error."
am: 5681b6638b

* commit '5681b6638b0001c62d02795b0853e2e82787edf1':
  Optimizing: Prevent potential valgrind error.